Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-29 02:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revised 9782 defaults (#1431)

Browse Source 
revised order to prevent some randomness around init
This commit is contained in:
Chris Gerth
2024-09-24 00:02:16 -05:00
committed by GitHub
parent a0c85fc95f
commit a8daff3ed4
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
photon-core/src/main/java/org/photonvision/vision/camera/QuirkyCamera.java
View File

@@ -55,6 +55,7 @@ public class QuirkyCamera {
"", "",
"Arducam Generic", "Arducam Generic",
CameraQuirk.ArduCamCamera, CameraQuirk.ArduCamCamera,
CameraQuirk.Gain,
CameraQuirk.StickyFPS), CameraQuirk.StickyFPS),
// Arducam OV2311 // Arducam OV2311
new QuirkyCamera( new QuirkyCamera(
@@ -73,17 +74,18 @@ public class QuirkyCamera {
"OV9281", "OV9281",
CameraQuirk.ArduCamCamera, CameraQuirk.ArduCamCamera,
CameraQuirk.ArduOV9281Controls), CameraQuirk.ArduOV9281Controls),
// Arducam OV // Arducam OV9782
new QuirkyCamera( new QuirkyCamera(
0x0c45, 0x0c45,
0x6366, 0x6366,
"OV9782", "OV9782",
"OV9782", "OV9782",
CameraQuirk.ArduCamCamera, CameraQuirk.ArduCamCamera,
CameraQuirk.Gain,
CameraQuirk.ArduOV9782Controls), CameraQuirk.ArduOV9782Controls),
// Innomaker OV9281 // Innomaker OV9281
new QuirkyCamera( 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 DefaultCamera = new QuirkyCamera(0, 0, "");
public static final QuirkyCamera ZeroCopyPiCamera = public static final QuirkyCamera ZeroCopyPiCamera =

9
photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/ArduOV9782CameraSettables.java
View File

@@ -26,6 +26,15 @@ public class ArduOV9782CameraSettables extends GenericUSBCameraSettables {
whiteBalanceTemperature = 3500; whiteBalanceTemperature = 3500;
} }
@Override
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 @Override
protected void setUpExposureProperties() { protected void setUpExposureProperties() {
super.setUpExposureProperties(); super.setUpExposureProperties();

1
photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/GenericUSBCameraSettables.java
View File

@@ -100,7 +100,6 @@ public class GenericUSBCameraSettables extends VisionSourceSettables {
softSet("exposure_dynamic_framerate", 0); softSet("exposure_dynamic_framerate", 0);
softSet("focus_auto", 0); softSet("focus_auto", 0);
softSet("focus_absolute", 0); // Focus into infinity softSet("focus_absolute", 0); // Focus into infinity
softSet("white_balance_temperature", whiteBalanceTemperature);
} }
public void setAutoExposure(boolean cameraAutoExposure) { public void setAutoExposure(boolean cameraAutoExposure) {

1
photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/LifeCam3kWindowsCameraSettables.java
View File

@@ -61,6 +61,7 @@ public class LifeCam3kWindowsCameraSettables extends GenericUSBCameraSettables {
} }
} }
@Override
public void setAutoExposure(boolean cameraAutoExposure) { public void setAutoExposure(boolean cameraAutoExposure) {
logger.debug("Setting auto exposure to " + cameraAutoExposure); logger.debug("Setting auto exposure to " + cameraAutoExposure);

2
photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/PsEyeCameraSettables.java
View File

@@ -25,6 +25,7 @@ public class PsEyeCameraSettables extends GenericUSBCameraSettables {
super(configuration, camera); super(configuration, camera);
} }
@Override
public void setAutoExposure(boolean cameraAutoExposure) { public void setAutoExposure(boolean cameraAutoExposure) {
logger.debug("Setting auto exposure to " + cameraAutoExposure); logger.debug("Setting auto exposure to " + cameraAutoExposure);
@@ -42,6 +43,7 @@ public class PsEyeCameraSettables extends GenericUSBCameraSettables {
} }
} }
@Override
public void setAllCamDefaults() { public void setAllCamDefaults() {
// Common settings for all cameras to attempt to get their image // Common settings for all cameras to attempt to get their image
// as close as possible to what we want for image processing // as close as possible to what we want for image processing