Merge branch 'master' into 742-robustness

PhotonVision · Jul 23, 2023 · c7cc564 · c7cc564
2 parents 2ea3453 + 454f8a1
commit c7cc564
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 43 deletions.
diff --git a/photon-core/src/main/java/org/photonvision/common/util/vision/OpenCvUtils.java b/photon-core/src/main/java/org/photonvision/common/util/vision/OpenCvUtils.java
diff --git a/photon-core/src/main/java/org/photonvision/vision/processes/PipelineManager.java b/photon-core/src/main/java/org/photonvision/vision/processes/PipelineManager.java
@@ -261,7 +261,7 @@ public boolean getDriverMode() {
     /**
      * Sorts the pipeline list by index, and reassigns their indexes to match the new order. <br>
      * <br>
-     * I don't like this but I have no other ideas, and it works so ¯\_(ツ)_/¯
+     * I don't like this but I have no other ideas, and it works so
      */
     private void reassignIndexes() {
         userPipelineSettings.sort(PipelineSettingsIndexComparator);

diff --git a/photon-core/src/main/java/org/photonvision/vision/processes/VisionSourceSettables.java b/photon-core/src/main/java/org/photonvision/vision/processes/VisionSourceSettables.java
@@ -22,7 +22,6 @@
 import org.photonvision.common.configuration.CameraConfiguration;
 import org.photonvision.common.logging.LogGroup;
 import org.photonvision.common.logging.Logger;
-import org.photonvision.common.util.vision.OpenCvUtils;
 import org.photonvision.vision.calibration.CameraCalibrationCoefficients;
 import org.photonvision.vision.frame.FrameStaticProperties;
 
@@ -64,11 +63,6 @@ public void setVideoModeInternal(int index) {
     }
 
     public void setVideoMode(VideoMode mode) {
-        if (OpenCvUtils.videoModeEquals(mode, getCurrentVideoMode())) {
-            logger.info("Requested video mode is already the current video mode");
-            return;
-        }
-
         logger.info(
                 "Setting video mode to "
                         + "FPS: "

diff --git a/photon-lib/src/main/native/include/photonlib/SimPhotonCamera.h b/photon-lib/src/main/native/include/photonlib/SimPhotonCamera.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <algorithm>
+#include <functional>
 #include <memory>
 #include <string>
 #include <vector>

diff --git a/scripts/install.sh b/scripts/install.sh
@@ -53,11 +53,11 @@ else
     echo 'GOVERNOR=performance' > /etc/default/cpufrequtils
 fi
 
-echo "Installing the JDK..."
-if ! package_is_installed openjdk-11-jdk-headless
+echo "Installing the JRE..."
+if ! package_is_installed openjre-11-jre-headless
 then
    apt-get update
-   apt-get install --yes openjdk-11-jdk-headless
+   apt-get install --yes openjre-11-jre-headless
 fi
 echo "JDK installation complete."