From fab75918da2fd1ee1036ddbcbdf9c033f5a5876f Mon Sep 17 00:00:00 2001 From: "Cameron (3539)" Date: Mon, 1 Jul 2024 22:14:22 -0400 Subject: [PATCH] Fix OV9782 typos (#1358) There were a couple of typos in the last OV9782 fix, this addresses those. Additionally, remove Matt's comment that he forgot. --- .../main/java/org/photonvision/common/util/TestUtils.java | 5 ----- .../java/org/photonvision/vision/camera/QuirkyCamera.java | 2 +- .../java/org/photonvision/vision/camera/USBCameraSource.java | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/photon-core/src/main/java/org/photonvision/common/util/TestUtils.java b/photon-core/src/main/java/org/photonvision/common/util/TestUtils.java index f84775a55..0f0dd70e8 100644 --- a/photon-core/src/main/java/org/photonvision/common/util/TestUtils.java +++ b/photon-core/src/main/java/org/photonvision/common/util/TestUtils.java @@ -50,11 +50,6 @@ public class TestUtils { public static boolean loadLibraries() { if (has_loaded) return true; - // None of these work either, wbhich is odd to me. commented out for now - // System.load("C:\\Users\\matth\\.wpilib\\nativecache\\windows\\x86-64\\4ca969397a399d7bcd38c546fd9ac2e1\\wpiutil.dll"); - // System.load("C:\\Users\\matth\\.wpilib\\nativecache\\windows\\x86-64\\4ca969397a399d7bcd38c546fd9ac2e1\\wpiutiljni.dll"); - // System.err.println("Test-load yay"); - NetworkTablesJNI.Helper.setExtractOnStaticLoad(false); WPIUtilJNI.Helper.setExtractOnStaticLoad(false); CameraServerJNI.Helper.setExtractOnStaticLoad(false); diff --git a/photon-core/src/main/java/org/photonvision/vision/camera/QuirkyCamera.java b/photon-core/src/main/java/org/photonvision/vision/camera/QuirkyCamera.java index d7e830b31..076070e6c 100644 --- a/photon-core/src/main/java/org/photonvision/vision/camera/QuirkyCamera.java +++ b/photon-core/src/main/java/org/photonvision/vision/camera/QuirkyCamera.java @@ -82,7 +82,7 @@ public class QuirkyCamera { "OV9782", "OV9782", CameraQuirk.ArduCamCamera, - CameraQuirk.ArduOV9281)); + CameraQuirk.ArduOV9782)); public static final QuirkyCamera DefaultCamera = new QuirkyCamera(0, 0, ""); public static final QuirkyCamera ZeroCopyPiCamera = diff --git a/photon-core/src/main/java/org/photonvision/vision/camera/USBCameraSource.java b/photon-core/src/main/java/org/photonvision/vision/camera/USBCameraSource.java index 9b9fad845..57d38fadc 100644 --- a/photon-core/src/main/java/org/photonvision/vision/camera/USBCameraSource.java +++ b/photon-core/src/main/java/org/photonvision/vision/camera/USBCameraSource.java @@ -202,6 +202,7 @@ public class USBCameraSource extends VisionSource { if (getCameraConfiguration().cameraQuirks.hasQuirk(CameraQuirk.ArduOV9782)) { try { // Set white balance temperature to 3500 for OV9782 camera + camera.getProperty("white_balance_automatic").set(0); camera.getProperty("white_balance_temperature").set(3500); } catch (VideoException e) { logger.error("Failed to set white balance temperature for OV9782 camera!", e);