From 59b5517ecc4ea2b17741f8f2f074387cabfe5bf0 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 22 Sep 2024 16:55:18 -0500 Subject: [PATCH] override fixups --- .../vision/camera/USBCameras/ArduOV9782CameraSettables.java | 1 + .../camera/USBCameras/LifeCam3kWindowsCameraSettables.java | 1 + .../vision/camera/USBCameras/PsEyeCameraSettables.java | 2 ++ 3 files changed, 4 insertions(+) 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 94cb7c351f..70fdbf9e1d 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,7 @@ public ArduOV9782CameraSettables(CameraConfiguration configuration, UsbCamera ca whiteBalanceTemperature = 3500; } + @Override public void setAllCamDefaults() { softSet("power_line_frequency", 2); // Assume 60Hz USA softSet("exposure_metering_mode", 0); diff --git a/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/LifeCam3kWindowsCameraSettables.java b/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/LifeCam3kWindowsCameraSettables.java index ef4a3029cd..b52dbd84de 100644 --- a/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/LifeCam3kWindowsCameraSettables.java +++ b/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/LifeCam3kWindowsCameraSettables.java @@ -61,6 +61,7 @@ public void setExposureRaw(double exposureRaw) { } } + @Override public void setAutoExposure(boolean cameraAutoExposure) { logger.debug("Setting auto exposure to " + cameraAutoExposure); diff --git a/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/PsEyeCameraSettables.java b/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/PsEyeCameraSettables.java index 8195ca4931..50e06916d0 100644 --- a/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/PsEyeCameraSettables.java +++ b/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/PsEyeCameraSettables.java @@ -25,6 +25,7 @@ public PsEyeCameraSettables(CameraConfiguration configuration, UsbCamera camera) super(configuration, camera); } + @Override public void setAutoExposure(boolean cameraAutoExposure) { logger.debug("Setting auto exposure to " + cameraAutoExposure); @@ -42,6 +43,7 @@ public void setAutoExposure(boolean cameraAutoExposure) { } } + @Override public void setAllCamDefaults() { // Common settings for all cameras to attempt to get their image // as close as possible to what we want for image processing