Skip to content

fix(photon-core): correct swapped VID/PID on three Logitech quirk entries #2530

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

Open
JosephTLockwood wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(photon-core): correct swapped VID/PID on three Logitech quirk entries #2530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 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 @@ -31,9 +31,9 @@ public class QuirkyCamera {
new QuirkyCamera(
0x2560, 0xc128, "See3Cam_24CUG", CameraQuirk.Gain, CameraQuirk.See3Cam_24CUG),
// Chris's older generic "Logitech HD Webcam"
new QuirkyCamera(0x9331, 0x5A3, CameraQuirk.CompletelyBroken),
new QuirkyCamera(0x5A3, 0x9331, CameraQuirk.CompletelyBroken),
// Logitech C270
new QuirkyCamera(0x825, 0x46D, CameraQuirk.CompletelyBroken),
new QuirkyCamera(0x46D, 0x825, CameraQuirk.CompletelyBroken),
// A laptop internal camera someone found broken
new QuirkyCamera(0x0bda, 0x5510, CameraQuirk.CompletelyBroken),
// SnapCamera on Windows
Expand All @@ -48,7 +48,7 @@ public class QuirkyCamera {
new QuirkyCamera(
0x1415, 0x2000, CameraQuirk.Gain, CameraQuirk.FPSCap100, CameraQuirk.PsEyeControls),
// Logitech C925-e
new QuirkyCamera(0x85B, 0x46D, CameraQuirk.AdjustableFocus),
new QuirkyCamera(0x46D, 0x85B, CameraQuirk.AdjustableFocus),
// Generic arducam. Since OV2311 can't be differentiated
// at first boot, apply stickyFPS to the generic case, too
new QuirkyCamera(
Expand Down
42 changes: 42 additions & 0 deletions photon-core/src/test/java/org/photonvision/vision/QuirkyCameraTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
package org.photonvision.vision;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.util.HashMap;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -49,4 +51,44 @@ public void quirklessCameraTest() {
QuirkyCamera quirkless = QuirkyCamera.getQuirkyCamera(1234, 8888);
assertEquals(quirkless.quirks, noQuirks);
}

@Test
public void logitechC270Test() {
// Logitech's USB VID is 0x046D; the C270's PID is 0x0825. Matching is VID-first.
QuirkyCamera c270 = QuirkyCamera.getQuirkyCamera(0x046D, 0x0825);
assertTrue(c270.hasQuirk(CameraQuirk.CompletelyBroken));

// The swapped (PID-first) order must NOT match
QuirkyCamera swapped = QuirkyCamera.getQuirkyCamera(0x0825, 0x046D);
assertFalse(swapped.hasQuirks());
}

@Test
public void logitechC925eTest() {
// Logitech's USB VID is 0x046D; the C925-e's PID is 0x085B
QuirkyCamera c925e = QuirkyCamera.getQuirkyCamera(0x046D, 0x085B);
assertTrue(c925e.hasQuirk(CameraQuirk.AdjustableFocus));

QuirkyCamera swapped = QuirkyCamera.getQuirkyCamera(0x085B, 0x046D);
assertFalse(swapped.hasQuirks());
}

@Test
public void genericLogitechHdWebcamTest() {
// ARC International's USB VID is 0x05A3; this webcam's PID is 0x9331
QuirkyCamera hdWebcam = QuirkyCamera.getQuirkyCamera(0x05A3, 0x9331);
assertTrue(hdWebcam.hasQuirk(CameraQuirk.CompletelyBroken));

QuirkyCamera swapped = QuirkyCamera.getQuirkyCamera(0x9331, 0x05A3);
assertFalse(swapped.hasQuirks());
}

@Test
public void see3CamTest() {
// e-con Systems' USB VID is 0x2560; the See3CAM_24CUG's PID is 0xC128.
// This entry was already VID-first; pin it so it stays that way.
QuirkyCamera see3Cam = QuirkyCamera.getQuirkyCamera(0x2560, 0xC128, "See3Cam_24CUG");
assertTrue(see3Cam.hasQuirk(CameraQuirk.Gain));
assertTrue(see3Cam.hasQuirk(CameraQuirk.See3Cam_24CUG));
}
}
Loading