Backport maven changes

.github/workflows/build.yml

@@ -10,6 +10,29 @@ on:
     branches: [ master ]
 
 jobs:
+  build-offline-docs:
+    name: "Build Offline Docs"
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: 'PhotonVision/photonvision-docs.git'
+          ref: master
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.9'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install sphinx sphinx_rtd_theme sphinx-tabs sphinxext-opengraph doc8
+          pip install -r requirements.txt
+      - name: Build the docs
+        run: |
+          make html
+      - uses: actions/upload-artifact@master
+        with:
+          name: built-docs
+          path: build/html
   build-photonlib-host:
     env:
       MACOSX_DEPLOYMENT_TARGET: 12

build.gradle

@@ -4,7 +4,7 @@ plugins {
     id "com.diffplug.spotless" version "6.24.0"
     id "edu.wpi.first.NativeUtils" version "2024.6.1" apply false
     id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2020.2"
-    id "edu.wpi.first.GradleRIO" version "2024.3.2"
+    id "edu.wpi.first.GradleRIO" version "2024.3.1"
     id 'edu.wpi.first.WpilibTools' version '1.3.0'
     id 'com.google.protobuf' version '0.9.4' apply false
 }
@@ -25,7 +25,7 @@ allprojects {
 apply from: "versioningHelper.gradle"
 
 ext {
-    wpilibVersion = "2024.3.2"
+    wpilibVersion = "2024.3.1"
     wpimathVersion = wpilibVersion
     openCVversion = "4.8.0-2"
     joglVersion = "2.4.0"

photon-client/src/components/dashboard/CamerasCard.vue

@@ -13,7 +13,11 @@ defineProps<{
 
 const driverMode = computed<boolean>({
   get: () => useCameraSettingsStore().isDriverMode,
-  set: (v) => useCameraSettingsStore().setDriverMode(v)
+  set: (v) =>
+    useCameraSettingsStore().changeCurrentPipelineIndex(
+      v ? -1 : useCameraSettingsStore().currentCameraSettings.lastPipelineIndex || 0,
+      true
+    )
 });
 
 const fpsTooLow = computed<boolean>(() => {

photon-client/src/components/dashboard/tabs/InputTab.vue

@@ -130,32 +130,12 @@ const interactiveCols = computed(() =>
       tooltip="Controls blue automatic white balance gain, which affects how the camera captures colors in different conditions"
       @input="(args) => useCameraSettingsStore().changeCurrentPipelineSetting({ cameraBlueGain: args }, false)"
     />
-    <!-- Disable camera orientation as stop gap for Issue 1084 until calibration data gets rotated. https://github.com/PhotonVision/photonvision/issues/1084 -->
-    <v-banner
-      v-show="
-        useCameraSettingsStore().isCurrentVideoFormatCalibrated &&
-        useCameraSettingsStore().currentPipelineSettings.inputImageRotationMode != 0
-      "
-      rounded
-      dark
-      color="red"
-      text-color="white"
-      class="mt-3"
-      icon="mdi-alert-circle-outline"
-    >
-      Warning! A known bug affects rotation of calibrated camera. Turn off rotation here and rotate using
-      cameraToRobotTransform in your robot code.
-    </v-banner>
     <pv-select
       v-model="useCameraSettingsStore().currentPipelineSettings.inputImageRotationMode"
       label="Orientation"
-      tooltip="Rotates the camera stream. Rotation not available when camera has been calibrated."
+      tooltip="Rotates the camera stream"
       :items="cameraRotations"
       :select-cols="interactiveCols"
-      :disabled="
-        useCameraSettingsStore().isCurrentVideoFormatCalibrated &&
-        useCameraSettingsStore().currentPipelineSettings.inputImageRotationMode == 0
-      "
       @input="(args) => useCameraSettingsStore().changeCurrentPipelineSetting({ inputImageRotationMode: args }, false)"
     />
     <pv-select

photon-client/src/stores/settings/CameraSettingsStore.ts

@@ -236,13 +236,6 @@ export const useCameraSettingsStore = defineStore("cameraSettings", {
       }
       useStateStore().websocket?.send(payload, true);
     },
-    setDriverMode(isDriverMode: boolean, cameraIndex: number = useStateStore().currentCameraIndex) {
-      const payload = {
-        driverMode: isDriverMode,
-        cameraIndex: cameraIndex
-      };
-      useStateStore().websocket?.send(payload, true);
-    },
     /**
      * Change the currently selected pipeline of the provided camera.
      *

photon-core/src/main/java/org/photonvision/jni/RknnDetectorJNI.java

@@ -22,12 +22,12 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.stream.Collectors;
-import org.opencv.core.Mat;
 import org.photonvision.common.logging.LogGroup;
 import org.photonvision.common.logging.Logger;
 import org.photonvision.common.util.TestUtils;
 import org.photonvision.rknn.RknnJNI;
 import org.photonvision.rknn.RknnJNI.RknnResult;
+import org.photonvision.vision.opencv.CVMat;
 import org.photonvision.vision.pipe.impl.NeuralNetworkPipeResult;
 
 public class RknnDetectorJNI extends PhotonJNICommon {
@@ -65,38 +65,16 @@ public class RknnDetectorJNI extends PhotonJNICommon {
         long objPointer = -1;
         private List<String> labels;
         private final Object lock = new Object();
-        private static final CopyOnWriteArrayList<RknnObjectDetector> detectors =
-                new CopyOnWriteArrayList<>();
-
-        static volatile boolean hook = false;
+        private static final CopyOnWriteArrayList<Long> detectors = new CopyOnWriteArrayList<>();
 
         public RknnObjectDetector(String modelPath, List<String> labels, RknnJNI.ModelVersion version) {
             synchronized (lock) {
                 objPointer = RknnJNI.create(modelPath, labels.size(), version.ordinal(), -1);
-                detectors.add(this);
-                logger.debug(
-                        "Created detector "
-                                + objPointer
-                                + " from path "
-                                + modelPath
-                                + "! Detectors: "
-                                + Arrays.toString(detectors.toArray()));
+                detectors.add(objPointer);
+                System.out.println(
+                        "Created " + objPointer + "! Detectors: " + Arrays.toString(detectors.toArray()));
             }
             this.labels = labels;
-
-            // the kernel should probably alredy deal with this for us, but I'm gunna be paranoid anyways.
-            if (!hook) {
-                Runtime.getRuntime()
-                        .addShutdownHook(
-                                new Thread(
-                                        () -> {
-                                            System.err.println("Shutdown hook rknn");
-                                            for (var d : detectors) {
-                                                d.release();
-                                            }
-                                        }));
-                hook = true;
-            }
         }
 
         public List<String> getClasses() {
@@ -111,14 +89,14 @@ public class RknnDetectorJNI extends PhotonJNICommon {
          * @param boxThresh Minimum confidence for a box to be added. Basically just confidence
          *     threshold
          */
-        public List<NeuralNetworkPipeResult> detect(Mat in, double nmsThresh, double boxThresh) {
+        public List<NeuralNetworkPipeResult> detect(CVMat in, double nmsThresh, double boxThresh) {
             RknnResult[] ret;
             synchronized (lock) {
                 // We can technically be asked to detect and the lock might be acquired _after_ release has
                 // been called. This would mean objPointer would be invalid which would call everything to
                 // explode.
                 if (objPointer > 0) {
-                    ret = RknnJNI.detect(objPointer, in.getNativeObjAddr(), nmsThresh, boxThresh);
+                    ret = RknnJNI.detect(objPointer, in.getMat().getNativeObjAddr(), nmsThresh, boxThresh);
                 } else {
                     logger.warn("Detect called after destroy -- giving up");
                     return List.of();
@@ -136,7 +114,7 @@ public class RknnDetectorJNI extends PhotonJNICommon {
             synchronized (lock) {
                 if (objPointer > 0) {
                     RknnJNI.destroy(objPointer);
-                    detectors.remove(this);
+                    detectors.remove(objPointer);
                     System.out.println(
                             "Killed " + objPointer + "! Detectors: " + Arrays.toString(detectors.toArray()));
                     objPointer = -1;
@@ -146,4 +124,14 @@ public class RknnDetectorJNI extends PhotonJNICommon {
             }
         }
     }
+
+    // public static void createRknnDetector() {
+    //     objPointer =
+    //             RknnJNI.create(
+    //                     NeuralNetworkModelManager.getInstance()
+    //                             .getDefaultRknnModel()
+    //                             .getAbsolutePath()
+    //                             .toString(),
+    //                     NeuralNetworkModelManager.getInstance().getLabels().size());
+    // }
 }

photon-core/src/main/java/org/photonvision/vision/aruco/PhotonArucoDetector.java

@@ -23,37 +23,16 @@ import java.util.Comparator;
 import org.opencv.core.Mat;
 import org.opencv.objdetect.ArucoDetector;
 import org.opencv.objdetect.DetectorParameters;
-import org.opencv.objdetect.Dictionary;
 import org.opencv.objdetect.Objdetect;
 import org.photonvision.common.logging.LogGroup;
 import org.photonvision.common.logging.Logger;
-import org.photonvision.vision.opencv.Releasable;
 
 /** This class wraps an {@link ArucoDetector} for convenience. */
-public class PhotonArucoDetector implements Releasable {
+public class PhotonArucoDetector {
     private static final Logger logger = new Logger(PhotonArucoDetector.class, LogGroup.VisionModule);
 
-    private static class ArucoDetectorHack extends ArucoDetector {
-        public ArucoDetectorHack(Dictionary predefinedDictionary) {
-            super(predefinedDictionary);
-        }
-
-        // avoid double-free by keeping track of this ourselves (ew)
-        private boolean freed = false;
-
-        @Override
-        public void finalize() throws Throwable {
-            if (freed) {
-                return;
-            }
-
-            super.finalize();
-            freed = true;
-        }
-    }
-
-    private final ArucoDetectorHack detector =
-            new ArucoDetectorHack(Objdetect.getPredefinedDictionary(Objdetect.DICT_APRILTAG_16h5));
+    private final ArucoDetector detector =
+            new ArucoDetector(Objdetect.getPredefinedDictionary(Objdetect.DICT_APRILTAG_16h5));
 
     private final Mat ids = new Mat();
     private final ArrayList<Mat> cornerMats = new ArrayList<>();
@@ -116,16 +95,4 @@ public class PhotonArucoDetector implements Releasable {
 
         return results;
     }
-
-    @Override
-    public void release() {
-        try {
-            detector.finalize();
-        } catch (Throwable e) {
-            logger.error("Exception destroying PhotonArucoDetector", e);
-        }
-        ids.release();
-        for (var m : cornerMats) m.release();
-        cornerMats.clear();
-    }
 }

photon-core/src/main/java/org/photonvision/vision/camera/USBCameraSource.java

@@ -270,13 +270,9 @@ public class USBCameraSource extends VisionSource {
                         if (getCameraConfiguration().cameraQuirks.hasQuirk(CameraQuirk.ArduOV9281)) {
                             propMin = 1;
                             propMax = 75;
-                        } else if (getCameraConfiguration().cameraQuirks.hasQuirk(CameraQuirk.ArduOV2311)) {
-                            propMin = 1;
-                            propMax = 140;
                         }
 
                         var exposure_manual_val = MathUtils.map(Math.round(exposure), 0, 100, propMin, propMax);
-                        logger.debug("Setting camera exposure to " + exposure_manual_val);
                         prop.set((int) exposure_manual_val);
                     } else {
                         scaledExposure = (int) Math.round(exposure);

photon-core/src/main/java/org/photonvision/vision/frame/provider/FileFrameProvider.java

@@ -33,7 +33,7 @@ import org.photonvision.vision.opencv.CVMat;
  * path}.
  */
 public class FileFrameProvider extends CpuImageProcessor {
-    public static final int MAX_FPS = 10;
+    public static final int MAX_FPS = 5;
     private static int count = 0;
 
     private final int thisIndex = count++;

photon-core/src/main/java/org/photonvision/vision/pipe/impl/AprilTagDetectionPipe.java

@@ -21,13 +21,11 @@ import edu.wpi.first.apriltag.AprilTagDetection;
 import edu.wpi.first.apriltag.AprilTagDetector;
 import java.util.List;
 import org.photonvision.vision.opencv.CVMat;
-import org.photonvision.vision.opencv.Releasable;
 import org.photonvision.vision.pipe.CVPipe;
 
 public class AprilTagDetectionPipe
-        extends CVPipe<CVMat, List<AprilTagDetection>, AprilTagDetectionPipeParams>
-        implements Releasable {
-    private AprilTagDetector m_detector = new AprilTagDetector();
+        extends CVPipe<CVMat, List<AprilTagDetection>, AprilTagDetectionPipeParams> {
+    private final AprilTagDetector m_detector = new AprilTagDetector();
 
     public AprilTagDetectionPipe() {
         super();
@@ -42,10 +40,6 @@ public class AprilTagDetectionPipe
             return List.of();
         }
 
-        if (m_detector == null) {
-            throw new RuntimeException("Apriltag detector was released!");
-        }
-
         var ret = m_detector.detect(in.getMat());
 
         if (ret == null) {
@@ -66,10 +60,4 @@ public class AprilTagDetectionPipe
 
         super.setParams(newParams);
     }
-
-    @Override
-    public void release() {
-        m_detector.close();
-        m_detector = null;
-    }
 }

photon-core/src/main/java/org/photonvision/vision/pipe/impl/AprilTagPoseEstimatorPipe.java

@@ -25,15 +25,13 @@ import org.opencv.calib3d.Calib3d;
 import org.opencv.core.MatOfPoint2f;
 import org.opencv.core.Point;
 import org.photonvision.vision.calibration.CameraCalibrationCoefficients;
-import org.photonvision.vision.opencv.Releasable;
 import org.photonvision.vision.pipe.CVPipe;
 
 public class AprilTagPoseEstimatorPipe
         extends CVPipe<
                 AprilTagDetection,
                 AprilTagPoseEstimate,
-                AprilTagPoseEstimatorPipe.AprilTagPoseEstimatorPipeParams>
-        implements Releasable {
+                AprilTagPoseEstimatorPipe.AprilTagPoseEstimatorPipeParams> {
     private final AprilTagPoseEstimator m_poseEstimator =
             new AprilTagPoseEstimator(new AprilTagPoseEstimator.Config(0, 0, 0, 0, 0));
 
@@ -94,11 +92,6 @@ public class AprilTagPoseEstimatorPipe
         super.setParams(newParams);
     }
 
-    @Override
-    public void release() {
-        temp.release();
-    }
-
     public static class AprilTagPoseEstimatorPipeParams {
         final AprilTagPoseEstimator.Config config;
         final CameraCalibrationCoefficients calibration;

photon-core/src/main/java/org/photonvision/vision/pipe/impl/ArucoDetectionPipe.java

@@ -29,12 +29,10 @@ import org.opencv.objdetect.Objdetect;
 import org.photonvision.vision.aruco.ArucoDetectionResult;
 import org.photonvision.vision.aruco.PhotonArucoDetector;
 import org.photonvision.vision.opencv.CVMat;
-import org.photonvision.vision.opencv.Releasable;
 import org.photonvision.vision.pipe.CVPipe;
 
 public class ArucoDetectionPipe
-        extends CVPipe<CVMat, List<ArucoDetectionResult>, ArucoDetectionPipeParams>
-        implements Releasable {
+        extends CVPipe<CVMat, List<ArucoDetectionResult>, ArucoDetectionPipeParams> {
     // ArucoDetector wrapper class
     private final PhotonArucoDetector photonDetector = new PhotonArucoDetector();
 
@@ -133,9 +131,4 @@ public class ArucoDetectionPipe
         var pt2 = new Point(corner.x + windowSize, corner.y + windowSize);
         Imgproc.rectangle(outputMat, pt1, pt2, new Scalar(0, 0, 255), thickness);
     }
-
-    @Override
-    public void release() {
-        photonDetector.release();
-    }
 }

photon-core/src/main/java/org/photonvision/vision/pipe/impl/ArucoPoseEstimatorPipe.java

@@ -32,15 +32,13 @@ import org.opencv.core.MatOfPoint3f;
 import org.opencv.core.Point3;
 import org.photonvision.vision.aruco.ArucoDetectionResult;
 import org.photonvision.vision.calibration.CameraCalibrationCoefficients;
-import org.photonvision.vision.opencv.Releasable;
 import org.photonvision.vision.pipe.CVPipe;
 
 public class ArucoPoseEstimatorPipe
         extends CVPipe<
                 ArucoDetectionResult,
                 AprilTagPoseEstimate,
-                ArucoPoseEstimatorPipe.ArucoPoseEstimatorPipeParams>
-        implements Releasable {
+                ArucoPoseEstimatorPipe.ArucoPoseEstimatorPipeParams> {
     // image points of marker corners
     private final MatOfPoint2f imagePoints = new MatOfPoint2f(Mat.zeros(4, 1, CvType.CV_32FC2));
     // rvec/tvec estimations from solvepnp
@@ -119,18 +117,6 @@ public class ArucoPoseEstimatorPipe
         super.setParams(newParams);
     }
 
-    @Override
-    public void release() {
-        imagePoints.release();
-        for (var m : rvecs) m.release();
-        rvecs.clear();
-        for (var m : tvecs) m.release();
-        tvecs.clear();
-        rvec.release();
-        tvec.release();
-        reprojectionErrors.release();
-    }
-
     public static class ArucoPoseEstimatorPipeParams {
         final CameraCalibrationCoefficients calibration;
         final double tagSize;

photon-core/src/main/java/org/photonvision/vision/pipe/impl/Calibrate3dPipe.java

@@ -38,26 +38,13 @@ import org.photonvision.vision.calibration.CameraCalibrationCoefficients;
 import org.photonvision.vision.calibration.CameraLensModel;
 import org.photonvision.vision.calibration.JsonImageMat;
 import org.photonvision.vision.calibration.JsonMatOfDouble;
-import org.photonvision.vision.frame.FrameStaticProperties;
 import org.photonvision.vision.pipe.CVPipe;
-import org.photonvision.vision.pipe.impl.FindBoardCornersPipe.FindBoardCornersPipeResult;
 
 public class Calibrate3dPipe
         extends CVPipe<
-                Calibrate3dPipe.CalibrationInput,
+                List<FindBoardCornersPipe.FindBoardCornersPipeResult>,
                 CameraCalibrationCoefficients,
                 Calibrate3dPipe.CalibratePipeParams> {
-    public static class CalibrationInput {
-        final List<FindBoardCornersPipe.FindBoardCornersPipeResult> observations;
-        final FrameStaticProperties imageProps;
-
-        public CalibrationInput(
-                List<FindBoardCornersPipeResult> observations, FrameStaticProperties imageProps) {
-            this.observations = observations;
-            this.imageProps = imageProps;
-        }
-    }
-
     // For logging
     private static final Logger logger = new Logger(Calibrate3dPipe.class, LogGroup.General);
 
@@ -76,9 +63,10 @@ public class Calibrate3dPipe
      * @return Result of processing.
      */
     @Override
-    protected CameraCalibrationCoefficients process(CalibrationInput in) {
-        var filteredIn =
-                in.observations.stream()
+    protected CameraCalibrationCoefficients process(
+            List<FindBoardCornersPipe.FindBoardCornersPipeResult> in) {
+        in =
+                in.stream()
                         .filter(
                                 it ->
                                         it != null
@@ -91,21 +79,17 @@ public class Calibrate3dPipe
         var start = System.nanoTime();
         if (MrCalJNILoader.getInstance().isLoaded() && params.useMrCal) {
             logger.debug("Calibrating with mrcal!");
-            ret =
-                    calibrateMrcal(
-                            filteredIn, in.imageProps.horizontalFocalLength, in.imageProps.verticalFocalLength);
+            ret = calibrateMrcal(in);
         } else {
             logger.debug("Calibrating with opencv!");
-            ret =
-                    calibrateOpenCV(
-                            filteredIn, in.imageProps.horizontalFocalLength, in.imageProps.verticalFocalLength);
+            ret = calibrateOpenCV(in);
         }
         var dt = System.nanoTime() - start;
 
         if (ret != null)
             logger.info(
                     "CALIBRATION SUCCESS for res "
-                            + in.observations.get(0).size
+                            + in.get(0).size
                             + " in "
                             + dt / 1e6
                             + "ms! camMatrix: \n"
@@ -119,7 +103,7 @@ public class Calibrate3dPipe
     }
 
     protected CameraCalibrationCoefficients calibrateOpenCV(
-            List<FindBoardCornersPipe.FindBoardCornersPipeResult> in, double fxGuess, double fyGuess) {
+            List<FindBoardCornersPipe.FindBoardCornersPipeResult> in) {
         List<Mat> objPoints = in.stream().map(it -> it.objectPoints).collect(Collectors.toList());
         List<Mat> imgPts = in.stream().map(it -> it.imagePoints).collect(Collectors.toList());
         if (objPoints.size() != imgPts.size()) {
@@ -127,32 +111,30 @@ public class Calibrate3dPipe
             return null;
         }
 
-        Mat cameraMatrix = new Mat(3, 3, CvType.CV_64F);
+        Mat cameraMatrix = new Mat();
         MatOfDouble distortionCoefficients = new MatOfDouble();
         List<Mat> rvecs = new ArrayList<>();
         List<Mat> tvecs = new ArrayList<>();
 
-        // initial camera matrix guess
-        double cx = (in.get(0).size.width / 2.0) - 0.5;
-        double cy = (in.get(0).size.width / 2.0) - 0.5;
-        cameraMatrix.put(0, 0, new double[] {fxGuess, 0, cx, 0, fyGuess, cy, 0, 0, 1});
+        // RMS of the calibration
+        double calibrationAccuracy;
 
         try {
             // FindBoardCorners pipe outputs all the image points, object points, and frames to calculate
             // imageSize from, other parameters are output Mats
 
-            Calib3d.calibrateCameraExtended(
-                    objPoints,
-                    imgPts,
-                    new Size(in.get(0).size.width, in.get(0).size.height),
-                    cameraMatrix,
-                    distortionCoefficients,
-                    rvecs,
-                    tvecs,
-                    stdDeviationsIntrinsics,
-                    stdDeviationsExtrinsics,
-                    perViewErrors,
-                    Calib3d.CALIB_USE_LU + Calib3d.CALIB_USE_INTRINSIC_GUESS);
+            calibrationAccuracy =
+                    Calib3d.calibrateCameraExtended(
+                            objPoints,
+                            imgPts,
+                            new Size(in.get(0).size.width, in.get(0).size.height),
+                            cameraMatrix,
+                            distortionCoefficients,
+                            rvecs,
+                            tvecs,
+                            stdDeviationsIntrinsics,
+                            stdDeviationsExtrinsics,
+                            perViewErrors);
         } catch (Exception e) {
             logger.error("Calibration failed!", e);
             e.printStackTrace();
@@ -182,22 +164,23 @@ public class Calibrate3dPipe
     }
 
     protected CameraCalibrationCoefficients calibrateMrcal(
-            List<FindBoardCornersPipe.FindBoardCornersPipeResult> in, double fxGuess, double fyGuess) {
+            List<FindBoardCornersPipe.FindBoardCornersPipeResult> in) {
         List<MatOfPoint2f> corner_locations =
                 in.stream().map(it -> it.imagePoints).map(MatOfPoint2f::new).collect(Collectors.toList());
 
         int imageWidth = (int) in.get(0).size.width;
         int imageHeight = (int) in.get(0).size.height;
+        final double FOCAL_LENGTH_GUESS = 1200;
 
-        MrCalResult result = null;
-                // MrCalJNI.calibrateCamera(
-                //         corner_locations,
-                //         params.boardWidth,
-                //         params.boardHeight,
-                //         params.squareSize,
-                //         imageWidth,
-                //         imageHeight,
-                //         (fxGuess + fyGuess) / 2.0);
+        MrCalResult result =
+                MrCalJNI.calibrateCamera(
+                        corner_locations,
+                        params.boardWidth,
+                        params.boardHeight,
+                        params.squareSize,
+                        imageWidth,
+                        imageHeight,
+                        FOCAL_LENGTH_GUESS);
 
         // intrinsics are fx fy cx cy from mrcal
         JsonMatOfDouble cameraMatrixMat =

photon-core/src/main/java/org/photonvision/vision/pipe/impl/Calibrate3dPipeline.java

@@ -36,7 +36,6 @@ import org.photonvision.vision.frame.FrameThresholdType;
 import org.photonvision.vision.opencv.CVMat;
 import org.photonvision.vision.opencv.ImageRotationMode;
 import org.photonvision.vision.pipe.CVPipe.CVPipeResult;
-import org.photonvision.vision.pipe.impl.Calibrate3dPipe.CalibrationInput;
 import org.photonvision.vision.pipe.impl.FindBoardCornersPipe.FindBoardCornersPipeResult;
 import org.photonvision.vision.pipeline.CVPipeline;
 import org.photonvision.vision.pipeline.Calibration3dPipelineSettings;
@@ -177,8 +176,7 @@ public class Calibrate3dPipeline
 
         /*Pass the board corners to the pipe, which will check again to see if all boards are valid
         and returns the corresponding image and object points*/
-        calibrationOutput =
-                calibrate3dPipe.run(new CalibrationInput(foundCornersList, frameStaticProperties));
+        calibrationOutput = calibrate3dPipe.run(foundCornersList);
 
         this.calibrating = false;
 
@@ -231,9 +229,4 @@ public class Calibrate3dPipeline
     public CameraCalibrationCoefficients cameraCalibrationCoefficients() {
         return calibrationOutput.output;
     }
-
-    @Override
-    public void release() {
-        // we never actually need to give resources up since pipelinemanager only makes one of us
-    }
 }

photon-core/src/main/java/org/photonvision/vision/pipe/impl/FilterObjectDetectionsPipe.java

@@ -41,7 +41,7 @@ public class FilterObjectDetectionsPipe
     }
 
     private void filterContour(NeuralNetworkPipeResult contour) {
-        var boc = contour.bbox;
+        var boc = contour.box;
 
         // Area filtering
         double areaPercentage = boc.area() / params.getFrameStaticProperties().imageArea * 100.0;

photon-core/src/main/java/org/photonvision/vision/pipe/impl/NeuralNetworkPipeResult.java

@@ -20,13 +20,13 @@ package org.photonvision.vision.pipe.impl;
 import org.opencv.core.Rect2d;
 
 public class NeuralNetworkPipeResult {
-    public NeuralNetworkPipeResult(Rect2d boundingBox, int classIdx, double confidence) {
-        bbox = boundingBox;
+    public NeuralNetworkPipeResult(Rect2d box2, Integer classIdx, Float confidence) {
+        box = box2;
         this.classIdx = classIdx;
         this.confidence = confidence;
     }
 
     public final int classIdx;
-    public final Rect2d bbox;
+    public final Rect2d box;
     public final double confidence;
 }

photon-core/src/main/java/org/photonvision/vision/pipe/impl/RknnDetectionPipe.java

@@ -17,17 +17,8 @@
 
 package org.photonvision.vision.pipe.impl;
 
-import java.awt.Color;
-import java.util.ArrayList;
 import java.util.List;
-import org.opencv.core.Core;
-import org.opencv.core.Mat;
-import org.opencv.core.Rect2d;
-import org.opencv.core.Scalar;
-import org.opencv.core.Size;
-import org.opencv.imgproc.Imgproc;
 import org.photonvision.common.configuration.NeuralNetworkModelManager;
-import org.photonvision.common.util.ColorHelper;
 import org.photonvision.jni.RknnDetectorJNI.RknnObjectDetector;
 import org.photonvision.vision.opencv.CVMat;
 import org.photonvision.vision.opencv.Releasable;
@@ -39,10 +30,8 @@ public class RknnDetectionPipe
     private RknnObjectDetector detector;
 
     public RknnDetectionPipe() {
-        // For now this is hard-coded to defaults. Should be refactored into set pipe
-        // params, though.
-        // And ideally a little wrapper helper for only changing native stuff on content
-        // change created.
+        // For now this is hard-coded to defaults. Should be refactored into set pipe params, though.
+        // And ideally a little wrapper helper for only changing native stuff on content change created.
         this.detector =
                 new RknnObjectDetector(
                         NeuralNetworkModelManager.getInstance().getDefaultRknnModel().getAbsolutePath(),
@@ -50,18 +39,6 @@ public class RknnDetectionPipe
                         NeuralNetworkModelManager.getInstance().getModelVersion());
     }
 
-    private static class Letterbox {
-        double dx;
-        double dy;
-        double scale;
-
-        public Letterbox(double dx, double dy, double scale) {
-            this.dx = dx;
-            this.dy = dy;
-            this.scale = scale;
-        }
-    }
-
     @Override
     protected List<NeuralNetworkPipeResult> process(CVMat in) {
         var frame = in.getMat();
@@ -71,67 +48,7 @@ public class RknnDetectionPipe
             return List.of();
         }
 
-        // letterbox
-        var letterboxed = new Mat();
-        var scale =
-                letterbox(frame, letterboxed, new Size(640, 640), ColorHelper.colorToScalar(Color.GRAY));
-
-        if (letterboxed.width() != 640 || letterboxed.height() != 640) {
-            // huh whack give up lol
-            throw new RuntimeException("RGA bugged but still wrong size");
-        }
-        var ret = detector.detect(letterboxed, params.nms, params.confidence);
-        letterboxed.release();
-
-        return resizeDetections(ret, scale);
-    }
-
-    private List<NeuralNetworkPipeResult> resizeDetections(
-            List<NeuralNetworkPipeResult> unscaled, Letterbox letterbox) {
-        var ret = new ArrayList<NeuralNetworkPipeResult>();
-
-        for (var t : unscaled) {
-            var scale = 1.0 / letterbox.scale;
-            var boundingBox = t.bbox;
-            double x = (boundingBox.x - letterbox.dx) * scale;
-            double y = (boundingBox.y - letterbox.dy) * scale;
-            double width = boundingBox.width * scale;
-            double height = boundingBox.height * scale;
-
-            ret.add(
-                    new NeuralNetworkPipeResult(new Rect2d(x, y, width, height), t.classIdx, t.confidence));
-        }
-
-        return ret;
-    }
-
-    private static Letterbox letterbox(Mat frame, Mat letterboxed, Size newShape, Scalar color) {
-        // from https://github.com/ultralytics/yolov5/issues/8427#issuecomment-1172469631
-        var frameSize = frame.size();
-        var r = Math.min(newShape.height / frameSize.height, newShape.width / frameSize.width);
-
-        var newUnpad = new Size(Math.round(frameSize.width * r), Math.round(frameSize.height * r));
-
-        if (!(frameSize.equals(newUnpad))) {
-            Imgproc.resize(frame, letterboxed, newUnpad, Imgproc.INTER_LINEAR);
-        } else {
-            frame.copyTo(letterboxed);
-        }
-
-        var dw = newShape.width - newUnpad.width;
-        var dh = newShape.height - newUnpad.height;
-
-        dw /= 2;
-        dh /= 2;
-
-        int top = (int) (Math.round(dh - 0.1f));
-        int bottom = (int) (Math.round(dh + 0.1f));
-        int left = (int) (Math.round(dw - 0.1f));
-        int right = (int) (Math.round(dw + 0.1f));
-        Core.copyMakeBorder(
-                letterboxed, letterboxed, top, bottom, left, right, Core.BORDER_CONSTANT, color);
-
-        return new Letterbox(dw, dh, r);
+        return detector.detect(in, params.nms, params.confidence);
     }
 
     public static class RknnDetectionPipeParams {

photon-core/src/main/java/org/photonvision/vision/pipeline/AprilTagPipeline.java

@@ -221,11 +221,4 @@ public class AprilTagPipeline extends CVPipeline<CVPipelineResult, AprilTagPipel
 
         return new CVPipelineResult(sumPipeNanosElapsed, fps, targetList, multiTagResult, frame);
     }
-
-    @Override
-    public void release() {
-        aprilTagDetectionPipe.release();
-        singleTagPoseEstimatorPipe.release();
-        super.release();
-    }
 }

photon-core/src/main/java/org/photonvision/vision/pipeline/ArucoPipeline.java

@@ -60,8 +60,8 @@ import org.photonvision.vision.target.TrackedTarget;
 import org.photonvision.vision.target.TrackedTarget.TargetCalculationParameters;
 
 public class ArucoPipeline extends CVPipeline<CVPipelineResult, ArucoPipelineSettings> {
-    private ArucoDetectionPipe arucoDetectionPipe = new ArucoDetectionPipe();
-    private ArucoPoseEstimatorPipe singleTagPoseEstimatorPipe = new ArucoPoseEstimatorPipe();
+    private final ArucoDetectionPipe arucoDetectionPipe = new ArucoDetectionPipe();
+    private final ArucoPoseEstimatorPipe singleTagPoseEstimatorPipe = new ArucoPoseEstimatorPipe();
     private final MultiTargetPNPPipe multiTagPNPPipe = new MultiTargetPNPPipe();
     private final CalculateFPSPipe calculateFPSPipe = new CalculateFPSPipe();
 
@@ -250,13 +250,4 @@ public class ArucoPipeline extends CVPipeline<CVPipelineResult, ArucoPipelineSet
                 windowSize,
                 constant);
     }
-
-    @Override
-    public void release() {
-        arucoDetectionPipe.release();
-        singleTagPoseEstimatorPipe.release();
-        arucoDetectionPipe = null;
-        singleTagPoseEstimatorPipe = null;
-        super.release();
-    }
 }

photon-core/src/main/java/org/photonvision/vision/pipeline/CVPipeline.java

@@ -34,9 +34,6 @@ public abstract class CVPipeline<R extends CVPipelineResult, S extends CVPipelin
 
     private final FrameThresholdType thresholdType;
 
-    // So releaseable doesn't keep track of if we double-free something. so (ew) remember that here
-    protected volatile boolean released = false;
-
     public CVPipeline(FrameThresholdType thresholdType) {
         this.thresholdType = thresholdType;
     }
@@ -67,9 +64,6 @@ public abstract class CVPipeline<R extends CVPipelineResult, S extends CVPipelin
     }
 
     public R run(Frame frame, QuirkyCamera cameraQuirks) {
-        if (released) {
-            throw new RuntimeException("Pipeline use-after-free!");
-        }
         if (settings == null) {
             throw new RuntimeException("No settings provided for pipeline!");
         }
@@ -91,7 +85,5 @@ public abstract class CVPipeline<R extends CVPipelineResult, S extends CVPipelin
      * switch. Stubbed out, but override if needed.
      */
     @Override
-    public void release() {
-        released = true;
-    }
+    public void release() {}
 }

photon-core/src/main/java/org/photonvision/vision/pipeline/DriverModePipeline.java

@@ -88,9 +88,4 @@ public class DriverModePipeline
                 fps,
                 new Frame(frame.processedImage, frame.colorImage, frame.type, frame.frameStaticProperties));
     }
-
-    @Override
-    public void release() {
-        // we never actually need to give resources up since pipelinemanager only makes one of us
-    }
 }

photon-core/src/main/java/org/photonvision/vision/pipeline/ObjectDetectionPipeline.java

@@ -131,6 +131,5 @@ public class ObjectDetectionPipeline
     @Override
     public void release() {
         rknnPipe.release();
-        super.release();
     }
 }

photon-core/src/main/java/org/photonvision/vision/processes/PipelineManager.java

@@ -61,8 +61,7 @@ public class PipelineManager {
     PipelineManager(
             DriverModePipelineSettings driverSettings,
             List<CVPipelineSettings> userPipelines,
-            String uniqueName,
-            int defaultIndex) {
+            String uniqueName) {
         this.userPipelineSettings = new ArrayList<>(userPipelines);
         // This is to respect the default res idx for vendor cameras
 
@@ -71,19 +70,10 @@ public class PipelineManager {
         if (userPipelines.isEmpty()) addPipeline(PipelineType.Reflective);
 
         calibration3dPipeline = new Calibrate3dPipeline(uniqueName);
-
-        // We know that at this stage, VisionRunner hasn't yet started so we're good to do this from
-        // this thread
-        this.setIndex(defaultIndex);
-        updatePipelineFromRequested();
     }
 
     public PipelineManager(CameraConfiguration config) {
-        this(
-                config.driveModeSettings,
-                config.pipelineSettings,
-                config.uniqueName,
-                config.currentPipelineIndex);
+        this(config.driveModeSettings, config.pipelineSettings, config.uniqueName);
     }
 
     /**
@@ -158,7 +148,6 @@ public class PipelineManager {
      * @return The currently active pipeline.
      */
     public CVPipeline getCurrentPipeline() {
-        updatePipelineFromRequested();
         if (currentPipelineIndex < 0) {
             switch (currentPipelineIndex) {
                 case CAL_3D_INDEX:
@@ -181,16 +170,6 @@ public class PipelineManager {
         return getPipelineSettings(currentPipelineIndex);
     }
 
-    private volatile int requestedIndex = 0;
-
-    /**
-     * Grab the currently requested pipeline index. The VisionRunner may not have changed over to this
-     * pipeline yet.
-     */
-    public int getRequestedIndex() {
-        return requestedIndex;
-    }
-
     /**
      * Internal method for setting the active pipeline. <br>
      * <br>
@@ -200,22 +179,6 @@ public class PipelineManager {
      * @param newIndex Index of pipeline to be active
      */
     private void setPipelineInternal(int newIndex) {
-        requestedIndex = newIndex;
-    }
-
-    /**
-     * Based on a requested pipeline index, create/destroy pipelines as necessary. We do this as a
-     * side effect of the main thread that calls getCurrentPipeline to avoid race conditions between
-     * server threads and the VisionRunner TODO: this should be refactored. Shame Java doesn't have
-     * RAII
-     */
-    private void updatePipelineFromRequested() {
-        int newIndex = requestedIndex;
-        if (newIndex == currentPipelineIndex) {
-            // nothing to do, probably no change -- give up
-            return;
-        }
-
         if (newIndex < 0 && currentPipelineIndex >= 0) {
             // Transitioning to a built-in pipe, save off the current user one
             lastUserPipelineIdx = currentPipelineIndex;
@@ -226,10 +189,44 @@ public class PipelineManager {
             return;
         }
 
-        currentPipelineIndex = newIndex;
+        // Cleanup potential old native resources before swapping over
+        if (currentUserPipeline != null) {
+            currentUserPipeline.release();
+        }
 
+        currentPipelineIndex = newIndex;
         if (newIndex >= 0) {
-            recreateUserPipeline();
+            var desiredPipelineSettings = userPipelineSettings.get(currentPipelineIndex);
+            switch (desiredPipelineSettings.pipelineType) {
+                case Reflective:
+                    logger.debug("Creating Reflective pipeline");
+                    currentUserPipeline =
+                            new ReflectivePipeline((ReflectivePipelineSettings) desiredPipelineSettings);
+                    break;
+                case ColoredShape:
+                    logger.debug("Creating ColoredShape pipeline");
+                    currentUserPipeline =
+                            new ColoredShapePipeline((ColoredShapePipelineSettings) desiredPipelineSettings);
+                    break;
+                case AprilTag:
+                    logger.debug("Creating AprilTag pipeline");
+                    currentUserPipeline =
+                            new AprilTagPipeline((AprilTagPipelineSettings) desiredPipelineSettings);
+                    break;
+
+                case Aruco:
+                    logger.debug("Creating Aruco Pipeline");
+                    currentUserPipeline = new ArucoPipeline((ArucoPipelineSettings) desiredPipelineSettings);
+                    break;
+                case ObjectDetection:
+                    logger.debug("Creating ObjectDetection Pipeline");
+                    currentUserPipeline =
+                            new ObjectDetectionPipeline(
+                                    (ObjectDetectionPipelineSettings) desiredPipelineSettings);
+                default:
+                    // Can be calib3d or drivermode, both of which are special cases
+                    break;
+            }
         }
 
         DataChangeService.getInstance()
@@ -238,48 +235,6 @@ public class PipelineManager {
                                 "fullsettings", ConfigManager.getInstance().getConfig().toHashMap()));
     }
 
-    /**
-     * Recreate the current user pipeline with the current pipeline index. Useful to force a
-     * recreation after changing pipeline type
-     */
-    private void recreateUserPipeline() {
-        // Cleanup potential old native resources before swapping over from a user pipeline
-        if (currentUserPipeline != null && !(currentPipelineIndex < 0)) {
-            currentUserPipeline.release();
-        }
-
-        var desiredPipelineSettings = userPipelineSettings.get(currentPipelineIndex);
-        switch (desiredPipelineSettings.pipelineType) {
-            case Reflective:
-                logger.debug("Creating Reflective pipeline");
-                currentUserPipeline =
-                        new ReflectivePipeline((ReflectivePipelineSettings) desiredPipelineSettings);
-                break;
-            case ColoredShape:
-                logger.debug("Creating ColoredShape pipeline");
-                currentUserPipeline =
-                        new ColoredShapePipeline((ColoredShapePipelineSettings) desiredPipelineSettings);
-                break;
-            case AprilTag:
-                logger.debug("Creating AprilTag pipeline");
-                currentUserPipeline =
-                        new AprilTagPipeline((AprilTagPipelineSettings) desiredPipelineSettings);
-                break;
-
-            case Aruco:
-                logger.debug("Creating Aruco Pipeline");
-                currentUserPipeline = new ArucoPipeline((ArucoPipelineSettings) desiredPipelineSettings);
-                break;
-            case ObjectDetection:
-                logger.debug("Creating ObjectDetection Pipeline");
-                currentUserPipeline =
-                        new ObjectDetectionPipeline((ObjectDetectionPipelineSettings) desiredPipelineSettings);
-            default:
-                // Can be calib3d or drivermode, both of which are special cases
-                break;
-        }
-    }
-
     /**
      * Enters or exits calibration mode based on the parameter. <br>
      * <br>
@@ -510,6 +465,5 @@ public class PipelineManager {
         userPipelineSettings.set(idx, newSettings);
         setPipelineInternal(idx);
         reassignIndexes();
-        recreateUserPipeline();
     }
 }

photon-core/src/main/java/org/photonvision/vision/processes/VisionModule.java

@@ -143,7 +143,7 @@ public class VisionModule {
         ntConsumer =
                 new NTDataPublisher(
                         visionSource.getSettables().getConfiguration().nickname,
-                        pipelineManager::getRequestedIndex,
+                        pipelineManager::getCurrentPipelineIndex,
                         this::setPipeline,
                         pipelineManager::getDriverMode,
                         this::setDriverMode);
@@ -156,7 +156,6 @@ public class VisionModule {
                 (result) ->
                         lastPipelineResultBestTarget = result.hasTargets() ? result.targets.get(0) : null);
 
-        // Sync VisionModule state with the first pipeline index
         setPipeline(visionSource.getSettables().getConfiguration().currentPipelineIndex);
 
         // Set vendor FOV
@@ -322,7 +321,7 @@ public class VisionModule {
 
     void changePipelineType(int newType) {
         pipelineManager.changePipelineType(newType);
-        setPipeline(pipelineManager.getRequestedIndex());
+        setPipeline(pipelineManager.getCurrentPipelineIndex());
         saveAndBroadcastAll();
     }
 
@@ -330,7 +329,9 @@ public class VisionModule {
         pipelineManager.setDriverMode(isDriverMode);
         setVisionLEDs(!isDriverMode);
         setPipeline(
-                isDriverMode ? PipelineManager.DRIVERMODE_INDEX : pipelineManager.getRequestedIndex());
+                isDriverMode
+                        ? PipelineManager.DRIVERMODE_INDEX
+                        : pipelineManager.getCurrentPipelineIndex());
         saveAndBroadcastAll();
     }
 
@@ -384,7 +385,7 @@ public class VisionModule {
         var ret = pipelineManager.calibration3dPipeline.tryCalibration();
         pipelineManager.setCalibrationMode(false);
 
-        setPipeline(pipelineManager.getRequestedIndex());
+        setPipeline(pipelineManager.getCurrentPipelineIndex());
 
         if (ret != null) {
             logger.debug("Saving calibration...");
@@ -446,7 +447,7 @@ public class VisionModule {
         setVisionLEDs(pipelineSettings.ledMode);
 
         visionSource.getSettables().getConfiguration().currentPipelineIndex =
-                pipelineManager.getRequestedIndex();
+                pipelineManager.getCurrentPipelineIndex();
 
         return true;
     }
@@ -510,7 +511,7 @@ public class VisionModule {
         ret.uniqueName = visionSource.getSettables().getConfiguration().uniqueName;
         ret.currentPipelineSettings =
                 SerializationUtils.objectToHashMap(pipelineManager.getCurrentPipelineSettings());
-        ret.currentPipelineIndex = pipelineManager.getRequestedIndex();
+        ret.currentPipelineIndex = pipelineManager.getCurrentPipelineIndex();
         ret.pipelineNicknames = pipelineManager.getPipelineNicknames();
         ret.cameraQuirks = visionSource.getSettables().getConfiguration().cameraQuirks;
 
@@ -552,7 +553,7 @@ public class VisionModule {
         var config = visionSource.getSettables().getConfiguration();
         config.setPipelineSettings(pipelineManager.userPipelineSettings);
         config.driveModeSettings = pipelineManager.driverModePipeline.getSettings();
-        config.currentPipelineIndex = Math.max(pipelineManager.getRequestedIndex(), -1);
+        config.currentPipelineIndex = Math.max(pipelineManager.getCurrentPipelineIndex(), -1);
 
         return config;
     }

photon-core/src/main/java/org/photonvision/vision/processes/VisionModuleChangeSubscriber.java

@@ -88,7 +88,7 @@ public class VisionModuleChangeSubscriber extends DataChangeSubscriber {
                         parentModule.saveAndBroadcastAll();
                         return;
                     case "deleteCurrPipeline":
-                        var indexToDelete = parentModule.pipelineManager.getRequestedIndex();
+                        var indexToDelete = parentModule.pipelineManager.getCurrentPipelineIndex();
                         logger.info("Deleting current pipe at index " + indexToDelete);
                         int newIndex = parentModule.pipelineManager.removePipeline(indexToDelete);
                         parentModule.setPipeline(newIndex);
@@ -96,7 +96,7 @@ public class VisionModuleChangeSubscriber extends DataChangeSubscriber {
                         return;
                     case "changePipeline": // change active pipeline
                         var index = (Integer) newPropValue;
-                        if (index == parentModule.pipelineManager.getRequestedIndex()) {
+                        if (index == parentModule.pipelineManager.getCurrentPipelineIndex()) {
                             logger.debug("Skipping pipeline change, index " + index + " already active");
                             return;
                         }
@@ -181,9 +181,6 @@ public class VisionModuleChangeSubscriber extends DataChangeSubscriber {
                         parentModule.changePipelineType((Integer) newPropValue);
                         parentModule.saveAndBroadcastAll();
                         return;
-                    case "isDriverMode":
-                        parentModule.setDriverMode((Boolean) newPropValue);
-                        return;
                 }
 
                 // special case for camera settables

photon-core/src/main/java/org/photonvision/vision/target/PotentialTarget.java

@@ -56,7 +56,7 @@ public class PotentialTarget implements Releasable {
     }
 
     public PotentialTarget(NeuralNetworkPipeResult det) {
-        this.shape = new CVShape(new Contour(det.bbox), ContourShape.Quadrilateral);
+        this.shape = new CVShape(new Contour(det.box), ContourShape.Quadrilateral);
         this.m_mainContour = this.shape.getContour();
         m_subContours = List.of();
         this.clsId = det.classIdx;

photon-core/src/test/java/org/photonvision/vision/processes/PipelineManagerTest.java

@@ -30,7 +30,7 @@ public class PipelineManagerTest {
     public void testUniqueName() {
         TestUtils.loadLibraries();
         PipelineManager manager =
-                new PipelineManager(new DriverModePipelineSettings(), List.of(), "meme_name", -1);
+                new PipelineManager(new DriverModePipelineSettings(), List.of(), "meme_name");
         manager.addPipeline(PipelineType.Reflective, "Another");
 
         // We now have ["New Pipeline", "Another"]

photon-lib/src/generate/native/cpp/PhotonVersion.cpp

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) Photon Vision.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include <string.h>
-#include <regex>
-
-/*
- * Autogenerated file! Do not manually edit this file. This version is
- * regenerated any time the publish task is run, or when this file is deleted.
- */
-
-static const char* dev_ = "dev";
-
-namespace photon {
-  namespace PhotonVersion {
-    const char* versionString = "dev-v2024.3.1-22-g38e2fdef";
-    const char* buildDate = "2024-5-29 10:05:11";
-    const bool isRelease = strncmp(dev_, versionString, strlen(dev_)) != 0;
-  }
-}

photon-lib/src/main/native/include/photon/simulation/SimCameraProperties.h

@@ -96,12 +96,12 @@ class SimCameraProperties {
                                       units::radian_t{std::numbers::pi / 2.0}})
                                      .Radians()}},
         frc::Translation3d{
-            1_m,
-            frc::Rotation3d{0_rad,
-                            (GetPixelPitch(0) + frc::Rotation2d{units::radian_t{
-                                                    std::numbers::pi / 2.0}})
-                                .Radians(),
-                            0_rad}},
+            1_m, frc::Rotation3d{0_rad,
+                                 (GetPixelPitch(0) +
+                                  frc::Rotation2d{
+                                      units::radian_t{std::numbers::pi / 2.0}})
+                                     .Radians(),
+                                 0_rad}},
         frc::Translation3d{
             1_m, frc::Rotation3d{0_rad,
                                  (GetPixelPitch(height) +

photon-server/src/main/java/org/photonvision/Main.java

@@ -277,7 +277,7 @@ public class Main {
 
         CameraConfiguration camConf2024 =
                 ConfigManager.getInstance().getConfig().getCameraConfigurations().get("WPI2024");
-        if (camConf2024 == null) {
+        if (camConf2024 == null || true) {
             camConf2024 =
                     new CameraConfiguration(
                             "WPI2024",

photon-server/src/main/java/org/photonvision/server/DataSocketHandler.java

@@ -131,16 +131,18 @@ public class DataSocketHandler {
                         case SMT_DRIVERMODE:
                             {
                                 // TODO: what is this event?
-                                var data = (Boolean) entryValue;
+                                var data = (HashMap<String, Object>) entryValue;
+                                var dmExpEvent =
+                                        new IncomingWebSocketEvent<Integer>(
+                                                DataChangeDestination.DCD_ACTIVEMODULE, "driverExposure", data);
+                                var dmBrightEvent =
+                                        new IncomingWebSocketEvent<Integer>(
+                                                DataChangeDestination.DCD_ACTIVEMODULE, "driverBrightness", data);
                                 var dmIsDriverEvent =
                                         new IncomingWebSocketEvent<Boolean>(
-                                                DataChangeDestination.DCD_ACTIVEMODULE,
-                                                "isDriverMode",
-                                                data,
-                                                cameraIndex,
-                                                context);
+                                                DataChangeDestination.DCD_ACTIVEMODULE, "isDriver", data);
 
-                                dcService.publishEvents(dmIsDriverEvent);
+                                dcService.publishEvents(dmExpEvent, dmBrightEvent, dmIsDriverEvent);
                                 break;
                             }
                         case SMT_CHANGECAMERANAME:

photonlib-cpp-examples/aimandrange/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "cpp"
     id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2024.3.2"
+    id "edu.wpi.first.GradleRIO" version "2024.3.1"
 
     id "com.dorongold.task-tree" version "2.1.0"
 }

photonlib-cpp-examples/aimattarget/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "cpp"
     id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2024.3.2"
+    id "edu.wpi.first.GradleRIO" version "2024.3.1"
 
     id "com.dorongold.task-tree" version "2.1.0"
 }

photonlib-cpp-examples/apriltagExample/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "cpp"
     id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2024.3.2"
+    id "edu.wpi.first.GradleRIO" version "2024.3.1"
 
     id "com.dorongold.task-tree" version "2.1.0"
 }

photonlib-cpp-examples/getinrange/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "cpp"
     id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2024.3.2"
+    id "edu.wpi.first.GradleRIO" version "2024.3.1"
 
     id "com.dorongold.task-tree" version "2.1.0"
 }

photonlib-cpp-examples/swervedriveposeestsim/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "cpp"
     id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2024.3.2"
+    id "edu.wpi.first.GradleRIO" version "2024.3.1"
 
     id "com.dorongold.task-tree" version "2.1.0"
 }
@@ -12,8 +12,8 @@ repositories {
 }
 
 wpi.maven.useDevelopment = true
-wpi.versions.wpilibVersion = "2024.3.2"
-wpi.versions.wpimathVersion = "2024.3.2"
+wpi.versions.wpilibVersion = "2024.3.1"
+wpi.versions.wpimathVersion = "2024.3.1"
 
 apply from: "${rootDir}/../shared/examples_common.gradle"
 

photonlib-java-examples/aimandrange/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.3.2"
+    id "edu.wpi.first.GradleRIO" version "2024.3.1"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11

photonlib-java-examples/aimattarget/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.3.2"
+    id "edu.wpi.first.GradleRIO" version "2024.3.1"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11

photonlib-java-examples/getinrange/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.3.2"
+    id "edu.wpi.first.GradleRIO" version "2024.3.1"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11

photonlib-java-examples/simaimandrange/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.3.2"
+    id "edu.wpi.first.GradleRIO" version "2024.3.1"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11

photonlib-java-examples/swervedriveposeestsim/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.3.2"
+    id "edu.wpi.first.GradleRIO" version "2024.3.1"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11
@@ -11,8 +11,8 @@ apply from: "${rootDir}/../shared/examples_common.gradle"
 def ROBOT_MAIN_CLASS = "frc.robot.Main"
 
 wpi.maven.useDevelopment = true
-wpi.versions.wpilibVersion = "2024.3.2"
-wpi.versions.wpimathVersion = "2024.3.2"
+wpi.versions.wpilibVersion = "2024.3.1"
+wpi.versions.wpimathVersion = "2024.3.1"
 
 
 // Define my targets (RoboRIO) and artifacts (deployable files)