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

Support for driver settings tab

Browse Source
This commit is contained in:
Omer
2019-11-01 17:01:10 +02:00
parent 7ef05e6077
commit a050dff150
5 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Main/src/main/java/com/chameleonvision/vision/camera/CameraDeserializer.java
View File

@@ -23,6 +23,7 @@ public class CameraDeserializer implements JsonDeserializer<Camera> {
var camName = jsonObj.get("name").getAsString();
var camNickname = jsonObj.get("nickname").getAsString();
var videoModeIndex = jsonObj.get("resolution").getAsInt();
var isDriver = jsonObj.get("isDriver").getAsBoolean();
var driverExposure = jsonObj.get("driverExposure").getAsInt();
var driverBrightness = jsonObj.get("driverBrightness").getAsInt();
var divisor = StreamDivisor.values()[jsonObj.get("streamDivisor").getAsInt()];
@@ -38,13 +39,13 @@ public class CameraDeserializer implements JsonDeserializer<Camera> {
e.printStackTrace();
}
var newCamera = actualPipelines != null ? new Camera(camName, camFOV, actualPipelines, videoModeIndex, divisor, driverExposure, driverBrightness) : new Camera(camName, camFOV, videoModeIndex, divisor, driverExposure, driverBrightness);
var newCamera = actualPipelines != null ? new Camera(camName, camFOV, actualPipelines, videoModeIndex, divisor, driverExposure, driverBrightness,isDriver) : new Camera(camName, camFOV, videoModeIndex, divisor, driverExposure, driverBrightness,isDriver);
newCamera.setNickname(camNickname != null ? camNickname : "");
return newCamera;
}
catch (NullPointerException e)
{
System.err.println("Error while reading json, value doesnt exist!");
System.err.println("Error while reading json, value doesn't exist!");
System.err.println("Try to delete the camera settings in settings/cameras/YOURCAMERA.json");
e.printStackTrace();
return null;