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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
ori agranat
2019-11-01 17:11:20 +02:00
parent 51a3f677bd a050dff150
commit cfd5f22f05
5 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,13 @@ public class ServerHandler {
sendFullSettings();
break;
}
case "driverMode": {
for (HashMap.Entry<String, Object> e : ((HashMap<String, Object>) entry.getValue()).entrySet()) {
setField(CameraManager.getCurrentCamera(), e.getKey(), e.getValue());
}
CameraManager.saveCameras();
break;
}
case "cameraSettings": {
HashMap camSettings = (HashMap) entry.getValue();
CameraManager.getCurrentCamera().setFOV((Number) camSettings.get("fov"));
@@ -225,6 +232,19 @@ public class ServerHandler {
return tmp;
}
private static HashMap<String, Object> getOrdinalDriver() {
HashMap<String, Object> tmp = new HashMap<>();
try {
var currentCamera = CameraManager.getCurrentCamera();
tmp.put("isDriver", currentCamera.getDriverMode());
tmp.put("driverBrightness", currentCamera.driverBrightness);
tmp.put("driverExposure", currentCamera.driverExposure);
} catch (CameraException e) {
e.printStackTrace();
}
return tmp;
}
public static void sendFullSettings() {
//General settings
Map<String, Object> fullSettings = new HashMap<>();
@@ -232,8 +252,9 @@ public class ServerHandler {
fullSettings.put("settings", getOrdinalSettings());
fullSettings.put("cameraSettings", getOrdinalCameraSettings());
fullSettings.put("cameraList", CameraManager.getAllCameraByNickname());
var currentCamera = CameraManager.getCurrentCamera();
fullSettings.put("pipeline", getOrdinalPipeline());
var currentCamera = CameraManager.getCurrentCamera();
fullSettings.put("driverMode",getOrdinalDriver());
fullSettings.put("pipelineList", currentCamera.getPipelinesNickname());
fullSettings.put("resolutionList", currentCamera.getResolutionList());
fullSettings.put("port", currentCamera.getStreamPort());