From 15d93320c9ce038fabf516ad7f8ca487679cbdfd Mon Sep 17 00:00:00 2001 From: ori agranat Date: Fri, 17 Jan 2020 04:55:26 -0800 Subject: [PATCH] updated wpi lib and bugfix ps eye detection --- chameleon-server/chameleon-vision.iml | 28 +++++++++---------- chameleon-server/pom.xml | 2 +- .../vision/camera/USBCaptureProperties.java | 4 +-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/chameleon-server/chameleon-vision.iml b/chameleon-server/chameleon-vision.iml index 93abb3b87..11b1a05d0 100644 --- a/chameleon-server/chameleon-vision.iml +++ b/chameleon-server/chameleon-vision.iml @@ -49,20 +49,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/chameleon-server/pom.xml b/chameleon-server/pom.xml index 9d5129f11..1ed1079b6 100644 --- a/chameleon-server/pom.xml +++ b/chameleon-server/pom.xml @@ -44,7 +44,7 @@ UTF-8 - 2020.1.2 + 2020.2.2 3.4.7-2 diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/camera/USBCaptureProperties.java b/chameleon-server/src/main/java/com/chameleonvision/vision/camera/USBCaptureProperties.java index fe5b22498..11a8d9dcb 100644 --- a/chameleon-server/src/main/java/com/chameleonvision/vision/camera/USBCaptureProperties.java +++ b/chameleon-server/src/main/java/com/chameleonvision/vision/camera/USBCaptureProperties.java @@ -22,8 +22,8 @@ public class USBCaptureProperties extends CaptureProperties { 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 int PS3EYE_VID = 0x1415; + private static final int PS3EYE_PID = 0x2000; private static final List ALLOWED_PIXEL_FORMATS = Arrays.asList(VideoMode.PixelFormat.kYUYV, VideoMode.PixelFormat.kMJPEG, VideoMode.PixelFormat.kBGR);