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

Update NetworkTable driver mode entry on UI change

Browse Source
This commit is contained in:
Matt
2019-11-30 20:29:14 -08:00
parent 004e1d380a
commit 2eea85c622
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ public class VisionProcess {
// network table stuff // network table stuff
private final NetworkTable defaultTable; private final NetworkTable defaultTable;
private NetworkTableEntry ntPipelineEntry; private NetworkTableEntry ntPipelineEntry;
private NetworkTableEntry ntDriverModeEntry; public NetworkTableEntry ntDriverModeEntry;
private int ntDriveModeListenerID; private int ntDriveModeListenerID;
private int ntPipelineListenerID; private int ntPipelineListenerID;
private NetworkTableEntry ntYawEntry; private NetworkTableEntry ntYawEntry;
@@ -131,6 +131,15 @@ public class VisionProcess {
pipelineManager.setCurrentPipeline(wantedPipelineIndex); pipelineManager.setCurrentPipeline(wantedPipelineIndex);
} }
public void setDriverModeEntry(boolean isDriverMode) {
// if it's null, we haven't even started the program yet, so just return
// otherwise, set it.
if(ntDriverModeEntry != null) {
ntDriverModeEntry.setBoolean(isDriverMode);
}
}
private void updateUI(CVPipelineResult data) { private void updateUI(CVPipelineResult data) {
if(cameraCapture.getProperties().name.equals(ConfigManager.settings.currentCamera)) { if(cameraCapture.getProperties().name.equals(ConfigManager.settings.currentCamera)) {
HashMap<String, Object> WebSend = new HashMap<>(); HashMap<String, Object> WebSend = new HashMap<>();

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

@@ -109,8 +109,14 @@ public class PipelineManager {
CVPipeline newPipeline; CVPipeline newPipeline;
if (index == DRIVERMODE_INDEX) { if (index == DRIVERMODE_INDEX) {
newPipeline = driverModePipeline; newPipeline = driverModePipeline;
// if we're changing into driver mode, try to set the nt entry to frue
parentProcess.setDriverModeEntry(true);
} else { } else {
newPipeline = pipelines.get(index); newPipeline = pipelines.get(index);
// if we're switching out of driver mode, try to set the nt entry to false
parentProcess.setDriverModeEntry(false);
} }
if (newPipeline != null) { if (newPipeline != null) {
lastPipelineIndex = currentPipelineIndex; lastPipelineIndex = currentPipelineIndex;