Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-26 01:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

general settings and camera settings as http requests

Browse Source
This commit is contained in:
ori agranat
2019-11-09 19:52:33 +02:00
parent 130cc394ee
commit 1198e2cf99
9 changed files with 153 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
View File

@@ -4,7 +4,7 @@ import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.vision.Orientation;
import com.chameleonvision.vision.Pipeline;
import com.chameleonvision.vision.camera.Camera;
import com.chameleonvision.web.ServerHandler;
import com.chameleonvision.web.SocketHandler;
import edu.wpi.cscore.VideoException;
import edu.wpi.first.networktables.*;
import org.opencv.core.*;
@@ -76,8 +76,8 @@ public class VisionProcess implements Runnable {
SettingsManager.GeneralSettings.currentPipeline = ntPipelineIndex;
HashMap<String, Object> pipeChange = new HashMap<>();
pipeChange.put("currentPipeline", ntPipelineIndex);
ServerHandler.broadcastMessage(pipeChange);
ServerHandler.sendFullSettings();
SocketHandler.broadcastMessage(pipeChange);
SocketHandler.sendFullSettings();
}
}
@@ -245,7 +245,7 @@ public class VisionProcess implements Runnable {
point.put("calculated", calculated);
point.put("rawPoint", center);
WebSend.put("point", point);
ServerHandler.broadcastMessage(WebSend);
SocketHandler.broadcastMessage(WebSend);
}
cameraProcess.setOutputFrame(streamOutputMat);