cleanups

Author: ryanshoff

photon-core/src/main/java/org/photonvision/common/configuration/PhotonConfiguration.java

@@ -21,20 +21,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import org.photonvision.PhotonVersion;
-import org.photonvision.common.hardware.Platform;
-import org.photonvision.common.networking.NetworkManager;
-import org.photonvision.common.networking.NetworkUtils;
-import org.photonvision.common.util.SerializationUtils;
-import org.photonvision.mrcal.MrCalJNILoader;
-import org.photonvision.raspi.LibCameraJNILoader;
-//import org.photonvision.jetson.JetsonMipiJNILoader;
-import org.photonvision.vision.calibration.UICameraCalibrationCoefficients;
-import org.photonvision.vision.camera.QuirkyCamera;
-import org.photonvision.vision.processes.VisionModule;
-import org.photonvision.vision.processes.VisionModuleManager;
 import org.photonvision.vision.processes.VisionSource;
 
 public class PhotonConfiguration {
@@ -115,54 +101,6 @@ public void addCameraConfig(String name, CameraConfiguration config) {
         cameraConfigurations.put(name, config);
     }
 
-    // public Map<String, Object> toHashMap() {
-    //     Map<String, Object> map = new HashMap<>();
-    //     var settingsSubmap = new HashMap<String, Object>();
-
-    //     // Hack active interfaces into networkSettings
-    //     var netConfigMap = networkConfig.toHashMap();
-    //     netConfigMap.put("networkInterfaceNames", NetworkUtils.getAllWiredInterfaces());
-    //     netConfigMap.put("networkingDisabled", NetworkManager.getInstance().networkingIsDisabled);
-
-    //     settingsSubmap.put("networkSettings", netConfigMap);
-
-    //     var lightingConfig = new UILightingConfig();
-    //     lightingConfig.brightness = hardwareSettings.ledBrightnessPercentage;
-    //     lightingConfig.supported = !hardwareConfig.ledPins.isEmpty();
-    //     settingsSubmap.put("lighting", SerializationUtils.objectToHashMap(lightingConfig));
-    //     // General Settings
-    //     var generalSubmap = new HashMap<String, Object>();
-    //     generalSubmap.put("version", PhotonVersion.versionString);
-    //     generalSubmap.put(
-    //             "gpuAcceleration",
-    //             LibCameraJNILoader.isSupported()
-    //                     ? "Zerocopy Libcamera Working"
-    //                     : ""); // TODO add support for other types of GPU accel
-    //     generalSubmap.put(
-    //             "cudaAcceleration",
-    //             false //JetsonMipiJNILoader.isSupported()
-    //                     ? "Jetson Cuda and mipi Working"
-    //                     : "");
-    //     generalSubmap.put("mrCalWorking", MrCalJNILoader.getInstance().isLoaded());
-    //     generalSubmap.put("availableModels", NeuralNetworkModelManager.getInstance().getModels());
-    //     generalSubmap.put(
-    //             "supportedBackends", NeuralNetworkModelManager.getInstance().getSupportedBackends());
-    //     generalSubmap.put("hardwareModel", hardwareConfig.deviceName);
-    //     generalSubmap.put("hardwarePlatform", Platform.getPlatformName());
-    //     settingsSubmap.put("general", generalSubmap);
-    //     // AprilTagFieldLayout
-    //     settingsSubmap.put("atfl", this.atfl);
-
-    //     map.put(
-    //             "cameraSettings",
-    //             VisionModuleManager.getInstance().getModules().stream()
-    //                     .map(VisionModule::toUICameraConfig)
-    //                     .map(SerializationUtils::objectToHashMap)
-    //                     .collect(Collectors.toList()));
-    //     map.put("settings", settingsSubmap);
-
-    //     return map;
-    // } // Comment to compile
     /**
      * Delete a camera by its unique name
      *

photon-core/src/main/java/org/photonvision/common/logging/PvCSCoreLogger.java

@@ -34,7 +34,7 @@ public static PvCSCoreLogger getInstance() {
     private Logger logger;
 
     private PvCSCoreLogger() {
-        CameraServerJNI.setLogger(this::logMsg, 7); // 7 RJS
+        CameraServerJNI.setLogger(this::logMsg, 7);
         this.logger = new Logger(getClass(), LogGroup.CSCore);
     }
 

photon-core/src/main/java/org/photonvision/jetson/JetsonMipiJNILoader.notjava

@@ -42,7 +42,6 @@
 import org.photonvision.jni.RknnDetectorJNI;
 import org.photonvision.mrcal.MrCalJNILoader;
 import org.photonvision.raspi.LibCameraJNILoader;
-//import org.photonvision.jetson.JetsonMipiJNILoader;
 import org.photonvision.server.Server;
 import org.photonvision.vision.apriltag.AprilTagFamily;
 import org.photonvision.vision.camera.PVCameraInfo;
@@ -229,13 +228,6 @@ public static void main(String[] args) {
         } catch (IOException e) {
             logger.error("Failed to load libcamera-JNI!", e);
         }
-	/*try {
-	    if (Platform.isJetson()) {
-                JetsonMipiJNILoader.forceLoad();
-            }
-	} catch (IOException e) {
-	    logger.error("Faileto load JetsonMipiJNI!", e);
-	}*/
         try {
             if (Platform.isRK3588()) {
                 RknnDetectorJNI.forceLoad();