From 36de88f9031aabde8030d66f82ca680b1f963852 Mon Sep 17 00:00:00 2001 From: Chris Gerth Date: Thu, 10 Dec 2020 14:10:27 -0600 Subject: [PATCH] Added camera pitch (tiltDegrees) to the hunk of data sent to the UI on initial request. (#176) --- .../java/org/photonvision/vision/processes/VisionModule.java | 3 +-- .../photonvision/vision/processes/VisionSourceSettables.java | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/photon-server/src/main/java/org/photonvision/vision/processes/VisionModule.java b/photon-server/src/main/java/org/photonvision/vision/processes/VisionModule.java index 9d7ab2e89..14b9f1a45 100644 --- a/photon-server/src/main/java/org/photonvision/vision/processes/VisionModule.java +++ b/photon-server/src/main/java/org/photonvision/vision/processes/VisionModule.java @@ -436,8 +436,7 @@ public class VisionModule { var ret = new PhotonConfiguration.UICameraConfiguration(); ret.fov = visionSource.getSettables().getFOV(); - // ret.tiltDegrees = this.visionSource.getSettables() // TODO implement tilt in camera - // settings + ret.tiltDegrees = this.visionSource.getSettables().getCameraPitch().getDegrees(); ret.nickname = visionSource.getSettables().getConfiguration().nickname; ret.currentPipelineSettings = SerializationUtils.objectToHashMap(pipelineManager.getCurrentPipelineSettings()); diff --git a/photon-server/src/main/java/org/photonvision/vision/processes/VisionSourceSettables.java b/photon-server/src/main/java/org/photonvision/vision/processes/VisionSourceSettables.java index de722efa8..4d2186bc0 100644 --- a/photon-server/src/main/java/org/photonvision/vision/processes/VisionSourceSettables.java +++ b/photon-server/src/main/java/org/photonvision/vision/processes/VisionSourceSettables.java @@ -66,6 +66,10 @@ public abstract class VisionSourceSettables { calculateFrameStaticProps(); } + public Rotation2d getCameraPitch() { + return configuration.camPitch; + } + @SuppressWarnings("unused") public void setVideoModeIndex(int index) { setVideoMode(videoModes.get(index));