Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revised 9782 defaults #1431

Merged
merged 3 commits into from
Sep 24, 2024
Merged

Revised 9782 defaults #1431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d1aa24
Revised 9782 defaults
gerth2 Sep 22, 2024
21fe025
Added gain support
gerth2 Sep 22, 2024
59b5517
override fixups
gerth2 Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions photon-core/src/main/java/org/photonvision/vision/camera/QuirkyCamera.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public class QuirkyCamera {
"",
"Arducam Generic",
CameraQuirk.ArduCamCamera,
CameraQuirk.Gain,
CameraQuirk.StickyFPS),
// Arducam OV2311
new QuirkyCamera(
Expand All @@ -73,17 +74,18 @@ public class QuirkyCamera {
"OV9281",
CameraQuirk.ArduCamCamera,
CameraQuirk.ArduOV9281Controls),
// Arducam OV
// Arducam OV9782
new QuirkyCamera(
0x0c45,
0x6366,
"OV9782",
"OV9782",
CameraQuirk.ArduCamCamera,
CameraQuirk.Gain,
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 =
Expand Down
9 changes: 9 additions & 0 deletions ...re/src/main/java/org/photonvision/vision/camera/USBCameras/ArduOV9782CameraSettables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@ public ArduOV9782CameraSettables(CameraConfiguration configuration, UsbCamera ca
whiteBalanceTemperature = 3500;
}

@Override
public void setAllCamDefaults() {
gerth2 marked this conversation as resolved.
Show resolved Hide resolved
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();
Expand Down
1 change: 0 additions & 1 deletion ...re/src/main/java/org/photonvision/vision/camera/USBCameras/GenericUSBCameraSettables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions .../main/java/org/photonvision/vision/camera/USBCameras/LifeCam3kWindowsCameraSettables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public void setExposureRaw(double exposureRaw) {
}
}

@Override
public void setAutoExposure(boolean cameraAutoExposure) {
logger.debug("Setting auto exposure to " + cameraAutoExposure);

Expand Down
2 changes: 2 additions & 0 deletions ...on-core/src/main/java/org/photonvision/vision/camera/USBCameras/PsEyeCameraSettables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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
Expand Down
Loading