From f2dbb34c45572be868608d4f561c816f2168da7c Mon Sep 17 00:00:00 2001 From: Chris Gerth Date: Sat, 29 Oct 2022 18:56:13 -0500 Subject: [PATCH] Added camera quirek to account for Facetime HD Cameras, and fix logging message --- .../common/configuration/CameraConfiguration.java | 2 ++ .../java/org/photonvision/vision/camera/QuirkyCamera.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/photon-core/src/main/java/org/photonvision/common/configuration/CameraConfiguration.java b/photon-core/src/main/java/org/photonvision/common/configuration/CameraConfiguration.java index 3f4c48b439..31cf849ad4 100644 --- a/photon-core/src/main/java/org/photonvision/common/configuration/CameraConfiguration.java +++ b/photon-core/src/main/java/org/photonvision/common/configuration/CameraConfiguration.java @@ -72,6 +72,7 @@ public CameraConfiguration(String baseName, String uniqueName, String nickname, logger.debug( "Creating USB camera configuration for " + cameraType + + " " + baseName + " (AKA " + nickname @@ -101,6 +102,7 @@ public CameraConfiguration( logger.debug( "Creating camera configuration for " + cameraType + + " " + baseName + " (AKA " + nickname diff --git a/photon-core/src/main/java/org/photonvision/vision/camera/QuirkyCamera.java b/photon-core/src/main/java/org/photonvision/vision/camera/QuirkyCamera.java index 42fcb89566..ad5d82349c 100644 --- a/photon-core/src/main/java/org/photonvision/vision/camera/QuirkyCamera.java +++ b/photon-core/src/main/java/org/photonvision/vision/camera/QuirkyCamera.java @@ -35,6 +35,11 @@ public class QuirkyCamera { CameraQuirk.CompletelyBroken), // A laptop internal camera someone found broken new QuirkyCamera( -1, -1, "Snap Camera", CameraQuirk.CompletelyBroken), // SnapCamera on Windows + new QuirkyCamera( + -1, + -1, + "FaceTime HD Camera", + CameraQuirk.CompletelyBroken), // Mac Facetime Camera shared into Windows in Bootcamp new QuirkyCamera(0x2000, 0x1415, CameraQuirk.Gain, CameraQuirk.FPSCap100), // PS3Eye new QuirkyCamera( -1, -1, "mmal service 16.1", CameraQuirk.PiCam), // PiCam (via V4L2, not zerocopy)