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

Attempt further memory fixes, begin unit tests, fix DriverMode rotation

Browse Source
This commit is contained in:
Banks Troutman
2019-12-01 04:39:21 -05:00
parent daa51b78b3
commit a24e633ceb
17 changed files with 186 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
chameleon-server/src/main/java/com/chameleonvision/config/CameraJsonConfig.java
View File

@@ -1,7 +1,7 @@
package com.chameleonvision.config;
import com.chameleonvision.vision.VisionProcess;
import com.chameleonvision.vision.camera.USBCameraProperties;
import com.chameleonvision.vision.camera.USBCaptureProperties;
import com.chameleonvision.vision.enums.StreamDivisor;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -31,7 +31,7 @@ public class CameraJsonConfig {
}
public CameraJsonConfig(String path, String name) {
this.fov = USBCameraProperties.DEFAULT_FOV;
this.fov = USBCaptureProperties.DEFAULT_FOV;
this.path = path;
this.name = name;
this.nickname = name;
@@ -40,7 +40,7 @@ public class CameraJsonConfig {
}
public static CameraJsonConfig fromVisionProcess(VisionProcess process) {
USBCameraProperties camProps = process.getCamera().getProperties();
USBCaptureProperties camProps = process.getCamera().getProperties();
int videomode = camProps.getCurrentVideoModeIndex();
StreamDivisor streamDivisor = process.cameraStreamer.getDivisor();
return new CameraJsonConfig(camProps.getFOV(), camProps.path, camProps.name, camProps.getNickname(), videomode, streamDivisor);