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

reworked driverMode, fixed streamDivisor

Browse Source
This commit is contained in:
Banks Troutman
2019-11-02 03:34:51 -04:00
parent 58e39b2922
commit bff2c2d8e0
5 changed files with 117 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,10 +65,25 @@ public class ServerHandler {
}
case "cameraSettings": {
HashMap camSettings = (HashMap) entry.getValue();
CameraManager.getCurrentCamera().setFOV((Number) camSettings.get("fov"));
CameraManager.getCurrentCamera().setStreamDivisor((Integer) camSettings.get("streamDivisor"));
CameraManager.getCurrentCamera().setCamVideoMode((Integer) camSettings.get("resolution"), true);
SettingsManager.saveSettings();
var curCam = CameraManager.getCurrentCamera();
Number newFOV = (Number) camSettings.get("fov");
Integer newStreamDivisor = (Integer) camSettings.get("streamDivisor");
Integer newResolution = (Integer) camSettings.get("resolution");
curCam.setFOV(newFOV);
var currentStreamDivisorOrdinal = curCam.getStreamDivisor().ordinal();
if (currentStreamDivisorOrdinal != newStreamDivisor) {
curCam.setStreamDivisor(newStreamDivisor, true);
}
var currentResolutionIndex = curCam.getVideoModeIndex();
if (currentResolutionIndex != newResolution) {
curCam.setCamVideoMode(newResolution, true);
}
CameraManager.saveCameras();
sendFullSettings();
break;
}
@@ -238,8 +253,8 @@ public class ServerHandler {
try {
var currentCamera = CameraManager.getCurrentCamera();
tmp.put("isDriver", currentCamera.getDriverMode());
tmp.put("driverBrightness", currentCamera.driverBrightness);
tmp.put("driverExposure", currentCamera.driverExposure);
tmp.put("driverBrightness", currentCamera.getDriverBrightness());
tmp.put("driverExposure", currentCamera.getDriverExposure());
} catch (CameraException e) {
e.printStackTrace();
}