From 93a7c96131fa2c5da94ce5229477eae36bddd959 Mon Sep 17 00:00:00 2001 From: Banks T Date: Tue, 7 Jul 2020 17:42:46 -0400 Subject: [PATCH] Update CSCore to fix linux cam dupes/BCM devices (#20) --- photon-server/build.gradle | 2 +- .../vision/processes/VisionSourceManager.java | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/photon-server/build.gradle b/photon-server/build.gradle index 6a12ad591..f176f133a 100644 --- a/photon-server/build.gradle +++ b/photon-server/build.gradle @@ -22,7 +22,7 @@ repositories { } ext { - wpilibVersion = '2020.3.2-75-g1557a4c' + wpilibVersion = '2020.3.2-99-g9f4de91' openCVVersion = '3.4.7-2' } diff --git a/photon-server/src/main/java/org/photonvision/vision/processes/VisionSourceManager.java b/photon-server/src/main/java/org/photonvision/vision/processes/VisionSourceManager.java index 1884ff0f0..868766c06 100644 --- a/photon-server/src/main/java/org/photonvision/vision/processes/VisionSourceManager.java +++ b/photon-server/src/main/java/org/photonvision/vision/processes/VisionSourceManager.java @@ -27,14 +27,26 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.StringUtils; import org.photonvision.common.configuration.CameraConfiguration; +import org.photonvision.common.logging.LogGroup; +import org.photonvision.common.logging.Logger; import org.photonvision.vision.camera.CameraType; import org.photonvision.vision.camera.USBCameraSource; import org.photonvision.vision.frame.provider.NetworkFrameProvider; public class VisionSourceManager { + + private static final Logger logger = new Logger(VisionSourceManager.class, LogGroup.Camera); + public static List loadAllSources( Collection camerasConfiguration) { - return LoadAllSources(camerasConfiguration, Arrays.asList(UsbCamera.enumerateUsbCameras())); + List usbCamInfos = Arrays.asList(UsbCamera.enumerateUsbCameras()); + + for (var usbCamInfo : usbCamInfos) { + logger.info( + "Adding local video device - \"" + usbCamInfo.name + "\" at \"" + usbCamInfo.path + "\""); + } + + return LoadAllSources(camerasConfiguration, usbCamInfos); } public static List LoadAllSources(