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

Fix driver mode hash map key bug

Browse Source
This commit is contained in:
Matt
2019-11-29 21:18:07 -08:00
parent 1a9b0982e4
commit 4aa9cc5dfc
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,10 +31,10 @@ public class VisionProcess {
public final CameraStreamer cameraStreamer;
public final PipelineManager pipelineManager;
private CVPipeline currentPipeline;
private int currentPipelineIndex = 0;
// private CVPipeline currentPipeline;
// private int currentPipelineIndex = 0;
private CVPipeline driverModePipeline = new DriverVisionPipeline(new CVPipelineSettings());
// private CVPipeline driverModePipeline = new DriverVisionPipeline(new CVPipelineSettings());
private volatile CVPipelineResult lastPipelineResult;

7
Main/src/main/java/com/chameleonvision/vision/pipeline/PipelineManager.java
View File

@@ -31,6 +31,7 @@ public class PipelineManager {
addInternalPipeline(setting);
}
}
driverModePipeline.initPipeline(visionProcess.getCamera());
setCurrentPipeline(0);
}
@@ -89,7 +90,11 @@ public class PipelineManager {
}
public CVPipeline getCurrentPipeline() {
return driverMode ? driverModePipeline : pipelines.get(currentPipelineIndex);
if (driverMode) {
return driverModePipeline;
} else {
return pipelines.get(currentPipelineIndex);
}
}
public void setCurrentPipeline(int index) {

4
Main/src/main/java/com/chameleonvision/web/SocketHandler.java
View File

@@ -56,8 +56,8 @@ public class SocketHandler {
switch (entry.getKey()) {
case "driverMode": {
HashMap<String, Object> data = (HashMap<String, Object>) entry.getValue();
currentProcess.getDriverModeSettings().exposure = (Integer) data.get("exposure");
currentProcess.getDriverModeSettings().brightness = (Integer) data.get("brightness");
currentProcess.getDriverModeSettings().exposure = (Integer) data.get("driverExposure");
currentProcess.getDriverModeSettings().brightness = (Integer) data.get("driverBrightness");
currentProcess.setDriverMode((Boolean) data.get("isDriver"));
VisionManager.saveCurrentCameraDriverMode();