Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-29 02:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fixed the sync and bug fixed the pipe change from nt

Browse Source
This commit is contained in:
ori agranat
2019-09-29 08:01:00 -07:00
parent b13f145ee6
commit 4e6bd3e75a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,11 +87,14 @@ public class VisionProcess implements Runnable {
System.err.println(e.toString()); System.err.println(e.toString());
} }
camera.setBrightness(pipeline.brightness); camera.setBrightness(pipeline.brightness);
HashMap<String, Object> pipeChange = new HashMap<>(); if (SettingsManager.GeneralSettings.curr_camera.equals(cameraName)){
pipeChange.put("curr_pipeline", ntPipelineIndex); SettingsManager.GeneralSettings.curr_pipeline = ntPipelineIndex;
ServerHandler.broadcastMessage(pipeChange); HashMap<String, Object> pipeChange = new HashMap<>();
ServerHandler.sendFullSettings(); pipeChange.put("curr_pipeline", ntPipelineIndex);
ServerHandler.broadcastMessage(pipeChange);
ServerHandler.sendFullSettings();
}
} else { } else {
ntPipelineEntry.setString("pipeline" + camera.getCurrentPipelineIndex()); ntPipelineEntry.setString("pipeline" + camera.getCurrentPipelineIndex());
} }

2
Main/src/main/java/com/chameleonvision/web/ServerHandler.java
View File

@@ -104,7 +104,7 @@ public class ServerHandler {
System.out.printf("Changing pipeline to %s\n", newPipeline); System.out.printf("Changing pipeline to %s\n", newPipeline);
CameraManager.setCurrentPipeline(pipelineNumber); CameraManager.setCurrentPipeline(pipelineNumber);
var Proccess = CameraManager.getCurrentCameraProcess(); var Proccess = CameraManager.getCurrentCameraProcess();
Proccess.ntPipelineEntry.setString(newPipeline); Proccess.ntPipelineEntry.setString("pipeline"+pipelineNumber);
broadcastMessage(allFieldsToMap(CameraManager.getCurrentPipeline())); broadcastMessage(allFieldsToMap(CameraManager.getCurrentPipeline()));
break; break;