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 2eb1982fd9..8f1f5a54ca 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 @@ -73,7 +73,7 @@ public class QuirkyCamera { "OV9281", CameraQuirk.ArduCamCamera, CameraQuirk.ArduOV9281Controls), - // Arducam OV + // Arducam OV9782 new QuirkyCamera( 0x0c45, 0x6366, @@ -83,7 +83,7 @@ public class QuirkyCamera { CameraQuirk.ArduOV9782Controls), // Innomaker OV9281 new QuirkyCamera( - 0x0c45, 0x636d, "USB Camera", "USB Camera", CameraQuirk.InnoOV9281Controls)); + 0x0c45, 0x636d, "USB Camera", "Innomaker OV9281", CameraQuirk.InnoOV9281Controls)); 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/USBCameras/ArduOV9782CameraSettables.java b/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/ArduOV9782CameraSettables.java index caf8036894..94cb7c351f 100644 --- a/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/ArduOV9782CameraSettables.java +++ b/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/ArduOV9782CameraSettables.java @@ -26,6 +26,14 @@ public ArduOV9782CameraSettables(CameraConfiguration configuration, UsbCamera ca whiteBalanceTemperature = 3500; } + public void setAllCamDefaults() { + softSet("power_line_frequency", 2); // Assume 60Hz USA + softSet("exposure_metering_mode", 0); + softSet("exposure_dynamic_framerate", 0); + softSet("white_balance_automatic", 0); + softSet("white_balance_temperature", whiteBalanceTemperature); + } + @Override protected void setUpExposureProperties() { super.setUpExposureProperties(); diff --git a/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/GenericUSBCameraSettables.java b/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/GenericUSBCameraSettables.java index e83fe11b50..818b567df3 100644 --- a/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/GenericUSBCameraSettables.java +++ b/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/GenericUSBCameraSettables.java @@ -100,7 +100,6 @@ public void setAllCamDefaults() { softSet("exposure_dynamic_framerate", 0); softSet("focus_auto", 0); softSet("focus_absolute", 0); // Focus into infinity - softSet("white_balance_temperature", whiteBalanceTemperature); } public void setAutoExposure(boolean cameraAutoExposure) {