From d60771d5c26fa0948c345d70657c078fb3319481 Mon Sep 17 00:00:00 2001 From: Matt Date: Sun, 16 Mar 2025 07:36:33 -0700 Subject: [PATCH 1/3] Add OV9281 AE startup quirk --- .../USBCameras/GenericUSBCameraSettables.java | 12 ++++++++++++ photon-server/src/main/resources/web/index.html | 15 ++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) 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 dcfea72c5f..6ca799410c 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 @@ -174,7 +174,19 @@ public void setAutoWhiteBalance(boolean autoWB) { } } + @Override public void setAutoExposure(boolean cameraAutoExposure) { + if (configuration.cameraQuirks.hasQuirk(CameraQuirk.ArduOV9281Controls) + && !cameraAutoExposure) { + // Poke the camera to get it into auto exposure mode + setAutoExposureImpl(true); + setAutoExposureImpl(false); + } else { + setAutoExposureImpl(cameraAutoExposure); + } + } + + public void setAutoExposureImpl(boolean cameraAutoExposure) { logger.debug("Setting auto exposure to " + cameraAutoExposure); if (!cameraAutoExposure) { diff --git a/photon-server/src/main/resources/web/index.html b/photon-server/src/main/resources/web/index.html index 988f55e6a3..7cda984ecb 100644 --- a/photon-server/src/main/resources/web/index.html +++ b/photon-server/src/main/resources/web/index.html @@ -1 +1,14 @@ -

UI has not been copied!

+ + + + + + + Photon Client + + + + +
+ + From 6f57d116b7bf63dc59c4101552ccb22b6d53af76 Mon Sep 17 00:00:00 2001 From: Matt Date: Sun, 16 Mar 2025 07:45:19 -0700 Subject: [PATCH 2/3] Update docs comment --- .../vision/camera/USBCameras/GenericUSBCameraSettables.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 6ca799410c..3a48eac20b 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 @@ -178,7 +178,8 @@ public void setAutoWhiteBalance(boolean autoWB) { public void setAutoExposure(boolean cameraAutoExposure) { if (configuration.cameraQuirks.hasQuirk(CameraQuirk.ArduOV9281Controls) && !cameraAutoExposure) { - // Poke the camera to get it into auto exposure mode + // OV9281 on Linux seems to sometimes ignore our exposure requests on first boot if we're in + // manual mode. Poking the camera into and out of auto exposure seems to fix it. setAutoExposureImpl(true); setAutoExposureImpl(false); } else { From a0cf05b8c084027ec95b4f619de5f9e470f946c6 Mon Sep 17 00:00:00 2001 From: Matt Date: Sun, 16 Mar 2025 07:47:15 -0700 Subject: [PATCH 3/3] oop --- photon-server/src/main/resources/web/index.html | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/photon-server/src/main/resources/web/index.html b/photon-server/src/main/resources/web/index.html index 7cda984ecb..988f55e6a3 100644 --- a/photon-server/src/main/resources/web/index.html +++ b/photon-server/src/main/resources/web/index.html @@ -1,14 +1 @@ - - - - - - - Photon Client - - - - -
- - +

UI has not been copied!