Merge branch 'master' into 2023-12-27_save_cal_data

PhotonVision · Jan 1, 2024 · ab1a8da · ab1a8da
2 parents 4ea4224 + f943712
commit ab1a8da
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 18 deletions.
diff --git a/photon-core/src/main/java/org/photonvision/vision/pipeline/DriverModePipeline.java b/photon-core/src/main/java/org/photonvision/vision/pipeline/DriverModePipeline.java
@@ -20,19 +20,15 @@
 import java.util.List;
 import org.apache.commons.lang3.tuple.Pair;
 import org.photonvision.common.util.math.MathUtils;
-import org.photonvision.raspi.LibCameraJNI;
-import org.photonvision.vision.camera.CameraQuirk;
 import org.photonvision.vision.frame.Frame;
 import org.photonvision.vision.frame.FrameThresholdType;
 import org.photonvision.vision.pipe.impl.CalculateFPSPipe;
 import org.photonvision.vision.pipe.impl.Draw2dCrosshairPipe;
 import org.photonvision.vision.pipe.impl.ResizeImagePipe;
-import org.photonvision.vision.pipe.impl.RotateImagePipe;
 import org.photonvision.vision.pipeline.result.DriverModePipelineResult;
 
 public class DriverModePipeline
         extends CVPipeline<DriverModePipelineResult, DriverModePipelineSettings> {
-    private final RotateImagePipe rotateImagePipe = new RotateImagePipe();
     private final Draw2dCrosshairPipe draw2dCrosshairPipe = new Draw2dCrosshairPipe();
     private final CalculateFPSPipe calculateFPSPipe = new CalculateFPSPipe();
     private final ResizeImagePipe resizeImagePipe = new ResizeImagePipe();
@@ -51,10 +47,6 @@ public DriverModePipeline(DriverModePipelineSettings settings) {
 
     @Override
     protected void setPipeParamsImpl() {
-        RotateImagePipe.RotateImageParams rotateImageParams =
-                new RotateImagePipe.RotateImageParams(settings.inputImageRotationMode);
-        rotateImagePipe.setParams(rotateImageParams);
-
         Draw2dCrosshairPipe.Draw2dCrosshairParams draw2dCrosshairParams =
                 new Draw2dCrosshairPipe.Draw2dCrosshairParams(
                         frameStaticProperties, settings.streamingFrameDivisor, settings.inputImageRotationMode);
@@ -72,19 +64,13 @@ protected void setPipeParamsImpl() {
     @Override
     public DriverModePipelineResult process(Frame frame, DriverModePipelineSettings settings) {
         long totalNanos = 0;
-        boolean accelerated = LibCameraJNI.isSupported() && cameraQuirks.hasQuirk(CameraQuirk.PiCam);
 
         // apply pipes
         var inputMat = frame.colorImage.getMat();
 
         boolean emptyIn = inputMat.empty();
 
         if (!emptyIn) {
-            if (!accelerated) {
-                var rotateImageResult = rotateImagePipe.run(inputMat);
-                totalNanos += rotateImageResult.nanosElapsed;
-            }
-
             totalNanos += resizeImagePipe.run(inputMat).nanosElapsed;
 
             var draw2dCrosshairResult = draw2dCrosshairPipe.run(Pair.of(inputMat, List.of()));

diff --git a/photon-core/src/main/java/org/photonvision/vision/processes/VisionRunner.java b/photon-core/src/main/java/org/photonvision/vision/processes/VisionRunner.java
@@ -75,6 +75,7 @@ private void update() {
             // (pipeline-dependent). I kinda hate how much leak this has...
             // TODO would a callback object be a better fit?
             var wantedProcessType = pipeline.getThresholdType();
+
             frameSupplier.requestFrameThresholdType(wantedProcessType);
             var settings = pipeline.getSettings();
             if (settings instanceof AdvancedPipelineSettings) {

diff --git a/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp b/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp
@@ -36,8 +36,7 @@
 #include "PhotonVersion.h"
 #include "photon/dataflow/structures/Packet.h"
 
-namespace {
-static constexpr const std::string_view bfw =
+inline constexpr std::string_view bfw =
     "\n\n\n\n"
     ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"
     ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"
@@ -57,7 +56,6 @@ static constexpr const std::string_view bfw =
     ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"
     ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"
     "\n\n";
-}  // namespace
 
 namespace photon {
 

diff --git a/scripts/install.sh b/scripts/install.sh
@@ -104,7 +104,7 @@ WorkingDirectory=/opt/photonvision
 Nice=-10
 # for non-uniform CPUs, like big.LITTLE, you want to select the big cores
 # look up the right values for your CPU
-# AllowCPUs=4-7
+# AllowedCPUs=4-7
 
 ExecStart=/usr/bin/java -Xmx512m -jar /opt/photonvision/photonvision.jar
 ExecStop=/bin/systemctl kill photonvision