From 55f01fb4b53ec5fd6fc94bc4f8cc585dfadb3c24 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 29 Nov 2019 21:21:40 -0800 Subject: [PATCH] Only allow changes if we aren't driver mode right now --- .../main/java/com/chameleonvision/vision/VisionProcess.java | 4 ++++ Main/src/main/java/com/chameleonvision/web/SocketHandler.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java b/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java index 0e8aa51f5..2d7394941 100644 --- a/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java +++ b/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java @@ -224,6 +224,10 @@ public class VisionProcess { return pipelineManager.driverModePipeline.settings; } + public boolean getIsDriverMode() { + return pipelineManager.getDriverMode(); + } + /** * VisionProcessRunnable will process images as quickly as possible */ diff --git a/Main/src/main/java/com/chameleonvision/web/SocketHandler.java b/Main/src/main/java/com/chameleonvision/web/SocketHandler.java index 55f7f3505..a79ea3d37 100644 --- a/Main/src/main/java/com/chameleonvision/web/SocketHandler.java +++ b/Main/src/main/java/com/chameleonvision/web/SocketHandler.java @@ -136,6 +136,10 @@ public class SocketHandler { break; } default: { + + // TODO handle not setting binary stuff on driver mode + if(currentProcess.getIsDriverMode()) break; + setField(currentPipeline.settings, entry.getKey(), entry.getValue()); switch (entry.getKey()) { case "exposure": {