more cleanups

Author: ryanshoff

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

@@ -27,7 +27,7 @@ const interactiveCols = computed(() =>
     <pv-select
       v-model="currentPipelineSettings.tagFamily"
       label="Target family"
-      :items="['AprilTag 36h11 (6.5in)', 'AprilTag 25h9 (6in)', 'AprilTag 16h5 (6in)']"
+      :items="['AprilTag 36h11 (6.5in)']"
       :select-cols="interactiveCols"
       @input="(value) => useCameraSettingsStore().changeCurrentPipelineSetting({ tagFamily: value }, false)"
     />

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

@@ -183,11 +183,7 @@ public void setAutoExposure(boolean cameraAutoExposure) {
             softSet("auto_exposure_bias", 0);
             softSet("iso_sensitivity_auto", 0); // Disable auto ISO adjustment
             softSet("iso_sensitivity", 0); // Manual ISO adjustment
-            softSet("white_balance_auto_preset", 2); // Auto white-balance disabled
-            softSet("white_balance_automatic", 0);
-            //softSet("white_balance_temperature", whiteBalanceTemperature); // Comment to compile
-	        if(autoExposureProp != null)
-            	autoExposureProp.set(PROP_AUTO_EXPOSURE_DISABLED);
+            if(autoExposureProp != null) autoExposureProp.set(PROP_AUTO_EXPOSURE_DISABLED);
 
             // Most cameras leave exposure time absolute at the last value from their AE
             // algorithm.
@@ -199,10 +195,7 @@ public void setAutoExposure(boolean cameraAutoExposure) {
             softSet("auto_exposure_bias", 12);
             softSet("iso_sensitivity_auto", 1);
             softSet("iso_sensitivity", 1); // Manual ISO adjustment by default
-            softSet("white_balance_auto_preset", 1); // Auto white-balance enabled
-            softSet("white_balance_automatic", 1);
-            if(autoExposureProp != null)
-                autoExposureProp.set(PROP_AUTO_EXPOSURE_ENABLED);
+            if(autoExposureProp != null) autoExposureProp.set(PROP_AUTO_EXPOSURE_ENABLED);
         }
     }
 
@@ -220,8 +213,7 @@ public double getMaxExposureRaw() {
     public void setExposureRaw(double exposureRaw) {
         if (exposureRaw >= 0.0) {
             try {
-	    	    if(autoExposureProp != null)
-                    autoExposureProp.set(PROP_AUTO_EXPOSURE_DISABLED);
+                if(autoExposureProp != null) autoExposureProp.set(PROP_AUTO_EXPOSURE_DISABLED);
 
                 int propVal = (int) MathUtil.clamp(exposureRaw, minExposure, maxExposure);
 
@@ -247,7 +239,6 @@ public void setExposureRaw(double exposureRaw) {
     @Override
     public void setBrightness(int brightness) {
         try {
-            //camera.setBrightness(brightness);
 	    softSet("brightness", brightness);
             this.lastBrightness = brightness;
         } catch (VideoException e) {
@@ -290,9 +281,8 @@ private void cacheVideoModes() {
 
 
             for (VideoMode videoMode : modes) {
-                // Filter grey modes
-                if (/*videoMode.pixelFormat == PixelFormat.kGray
-                        || */ videoMode.pixelFormat == PixelFormat.kUnknown) {
+                // Filter unknown modes
+                if ( videoMode.pixelFormat == PixelFormat.kUnknown) {
                     continue;
                 }
 

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

@@ -27,9 +27,7 @@ public InnoOV9281CameraSettables(CameraConfiguration configuration, UsbCamera ca
 
     @Override
     protected void setUpExposureProperties() {
-	logger.debug("pre super setup");
         super.setUpExposureProperties();
-	logger.debug("post super setup");
 
         // Property limits are incorrect
         this.minExposure = 1;

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

@@ -29,15 +29,12 @@
 public class AprilTagDetectionCudaPipe
         extends CVPipe<CVMat, List<AprilTagDetection>, AprilTagDetectionCudaPipeParams>
         implements Releasable {
-    //private AprilTagDetector m_detector = new AprilTagDetector();
     private GpuDetectorJNI m_cudadetector = new GpuDetectorJNI();
     private long handle = 0;
 
     public AprilTagDetectionCudaPipe() {
         super();
 
-        //m_detector.addFamily("tag16h5");
-        //m_detector.addFamily("tag36h11");
 	handle = m_cudadetector.createGpuDetector(640,480); // just a guess
     }
 
@@ -47,10 +44,6 @@ protected List<AprilTagDetection> process(CVMat in) {
             return List.of();
         }
 
-        //if (m_detector == null) {
-        //    throw new RuntimeException("Apriltag detector was released!");
-        //}
-
         var ret = m_cudadetector.processimage(handle, in.getMat().getNativeObjAddr());
 
         if (ret == null) {
@@ -63,11 +56,6 @@ protected List<AprilTagDetection> process(CVMat in) {
     @Override
     public void setParams(AprilTagDetectionCudaPipeParams newParams) {
         if (this.params == null || !this.params.equals(newParams)) {
-            //m_detector.setConfig(newParams.detectorParams);
-
-            //m_detector.clearFamilies();
-            //m_detector.addFamily(newParams.family.getNativeName());
-
 		if( newParams.cameraCalibrationCoefficients == null ) return;
 
 		final Mat cameraMatrix = newParams.cameraCalibrationCoefficients.getCameraIntrinsicsMat();
@@ -91,8 +79,6 @@ public void setParams(AprilTagDetectionCudaPipeParams newParams) {
 
     @Override
     public void release() {
-        //m_detector.close();
-        //m_detector = null;
 	m_cudadetector.destroyGpuDetector(handle);
 	m_cudadetector = null;
     }

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

@@ -269,7 +269,6 @@ private void recreateUserPipeline() {
                         new AprilTagCudaPipeline((AprilTagCudaPipelineSettings) desiredPipelineSettings);
             }
             case Aruco -> {
-
                 logger.debug("Creating Aruco Pipeline");
                 currentUserPipeline = new ArucoPipeline((ArucoPipelineSettings) desiredPipelineSettings);
             }

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-Unknown";
-    const char* buildDate = "2025-1-20 10:28:10";
-    const bool isRelease = strncmp(dev_, versionString, strlen(dev_)) != 0;
-  }
-}

photon-server/src/main/resources/web/index.html

@@ -1,14 +1 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" href="./favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Photon Client</title>
-    <script type="module" crossorigin src="./assets/index-D7Gocgo9.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-DZEIDu-s.css">
-  </head>
-  <body>
-    <div id="app"></div>
-  </body>
-</html>
+<p>UI has not been copied!</p>