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

Add PS3Eye detection

Browse Source
This commit is contained in:
Banks Troutman
2019-11-26 01:39:36 -05:00
parent 79fd79be41
commit 29b52d485b
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Main/src/main/java/com/chameleonvision/vision/camera/USBCameraProperties.java
View File

@@ -20,6 +20,10 @@ public class USBCameraProperties extends CaptureProperties {
private static final int MINIMUM_WIDTH = 320;
private static final int MINIMUM_HEIGHT = 200;
private static final int MAX_INIT_MS = 1500;
private static final int PS3EYE_VID = 1415;
private static final int PS3EYE_PID = 2000;
private static final List<VideoMode.PixelFormat> ALLOWED_PIXEL_FORMATS = Arrays.asList(VideoMode.PixelFormat.kYUYV, VideoMode.PixelFormat.kMJPEG);
private static final Predicate<VideoMode> kMinFPSPredicate = (videoMode -> videoMode.fps >= MINIMUM_FPS);
@@ -31,12 +35,11 @@ public class USBCameraProperties extends CaptureProperties {
public final List<VideoMode> videoModes;
private final UsbCamera baseCamera;
private final boolean hasGain;
public final boolean isPS3Eye;
private String nickname;
public double FOV;
USBCameraProperties(UsbCamera baseCamera, CameraConfig config) {
FOV = config.fov;
name = config.name;
@@ -44,6 +47,9 @@ public class USBCameraProperties extends CaptureProperties {
nickname = config.nickname;
this.baseCamera = baseCamera;
int usbVID = baseCamera.getInfo().vendorId;
int usbPID = baseCamera.getInfo().productId;
// wait for camera USB init on Windows, Windows USB is slow...
if (Platform.CurrentPlatform == Platform.WINDOWS_64 && !baseCamera.isConnected()) {
System.out.print("Waiting on camera... ");
@@ -57,17 +63,7 @@ public class USBCameraProperties extends CaptureProperties {
System.out.printf("USBCameraProcess initialized in %.2fms\n", initTimeMs);
}
// TODO: (low) find way to determine if camera is a PS3Eye
hasGain = false;
// var props = baseCamera.enumerateProperties();
// for (var prop : props) {
// var name = prop.getName();
// var min = prop.getMin();
// var max = prop.getMax();
// var _default = prop.getDefault();
// var kind = prop.getKind();
// }
isPS3Eye = (usbVID == PS3EYE_VID && usbPID == PS3EYE_PID);
videoModes = filterVideoModes(baseCamera.enumerateVideoModes());
}