From 4aa9cc5dfc798865f536a6866699eaaa4072ecfc Mon Sep 17 00:00:00 2001
From: Matt <matthew.morley.ca@gmail.com>
Date: Fri, 29 Nov 2019 21:18:07 -0800
Subject: [PATCH] Fix driver mode hash map key bug

---
 .../java/com/chameleonvision/vision/VisionProcess.java     | 6 +++---
 .../chameleonvision/vision/pipeline/PipelineManager.java   | 7 ++++++-
 .../main/java/com/chameleonvision/web/SocketHandler.java   | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java b/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java
index 4776c6e99..0e8aa51f5 100644
--- a/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java
+++ b/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java
@@ -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;
 
diff --git a/Main/src/main/java/com/chameleonvision/vision/pipeline/PipelineManager.java b/Main/src/main/java/com/chameleonvision/vision/pipeline/PipelineManager.java
index 14ce128be..ec2bd67b0 100644
--- a/Main/src/main/java/com/chameleonvision/vision/pipeline/PipelineManager.java
+++ b/Main/src/main/java/com/chameleonvision/vision/pipeline/PipelineManager.java
@@ -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) {
diff --git a/Main/src/main/java/com/chameleonvision/web/SocketHandler.java b/Main/src/main/java/com/chameleonvision/web/SocketHandler.java
index 8f1d1065c..55f7f3505 100644
--- a/Main/src/main/java/com/chameleonvision/web/SocketHandler.java
+++ b/Main/src/main/java/com/chameleonvision/web/SocketHandler.java
@@ -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();