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

bug fixed tilt save

Browse Source
This commit is contained in:
Unknown
2020-02-26 09:51:03 +02:00
parent 6e0bb58445
commit 03c7102184
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@ public class CameraJsonConfig {
public final String name;
public final String nickname;
public final int videomode;
public final double tilt;
public final StreamDivisor streamDivisor;
@JsonCreator
@@ -21,13 +22,15 @@ public class CameraJsonConfig {
@JsonProperty("name") String name,
@JsonProperty("nickname") String nickname,
@JsonProperty("videomode") int videomode,
@JsonProperty("streamDivisor") StreamDivisor streamDivisor) {
@JsonProperty("streamDivisor") StreamDivisor streamDivisor,
@JsonProperty("tilt") double tilt) {
this.fov = fov;
this.path = path;
this.name = name;
this.nickname = nickname;
this.videomode = videomode;
this.streamDivisor = streamDivisor;
this.tilt = tilt;
}
public CameraJsonConfig(String path, String name) {
@@ -37,12 +40,14 @@ public class CameraJsonConfig {
this.nickname = name;
this.videomode = 0;
this.streamDivisor = StreamDivisor.NONE;
this.tilt = 0;
}
public static CameraJsonConfig fromVisionProcess(VisionProcess process) {
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);
double tilt = process.getCamera().getProperties().getTilt().getDegrees();
return new CameraJsonConfig(camProps.getFOV(), camProps.path, camProps.name, camProps.getNickname(), videomode, streamDivisor, tilt);
}
}

1
chameleon-server/src/main/java/com/chameleonvision/vision/camera/USBCaptureProperties.java
View File

@@ -45,6 +45,7 @@ public class USBCaptureProperties extends CaptureProperties {
FOV = config.fov;
name = config.name;
path = config.path;
setTilt(Rotation2d.fromDegrees(config.tilt));
nickname = config.nickname;
this.baseCamera = baseCamera;