From accc1a549ff1f45a316b9c2ae99d28c969310db4 Mon Sep 17 00:00:00 2001 From: Titan Robotics Club Date: Sat, 21 Sep 2024 18:17:48 -0700 Subject: [PATCH] Updated ftclib, trclib. Don't allow colorblob tuning test to switch camera. It only supports webcam1. --- TeamCode/src/main/java/ftclib | 2 +- TeamCode/src/main/java/teamcode/FtcTest.java | 11 ----------- TeamCode/src/main/java/trclib | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/TeamCode/src/main/java/ftclib b/TeamCode/src/main/java/ftclib index 4ce2631..0d08702 160000 --- a/TeamCode/src/main/java/ftclib +++ b/TeamCode/src/main/java/ftclib @@ -1 +1 @@ -Subproject commit 4ce26319c94beac022ffde84959d0b36bf7b3c5b +Subproject commit 0d087024161bffdd6935759f49afd0eca8202a03 diff --git a/TeamCode/src/main/java/teamcode/FtcTest.java b/TeamCode/src/main/java/teamcode/FtcTest.java index 0c06af8..38674db 100644 --- a/TeamCode/src/main/java/teamcode/FtcTest.java +++ b/TeamCode/src/main/java/teamcode/FtcTest.java @@ -549,17 +549,6 @@ public class FtcTest extends FtcTeleOp } passToTeleOp = false; } - else if ((testChoices.test == Test.TUNE_COLORBLOB_VISION || testChoices.test == Test.VISION_TEST) && - robot.vision != null) - { - // Can only switch camera if we have two. - if (pressed && frontWebcam != null && rearWebcam != null) - { - robot.vision.setActiveWebcam( - robot.vision.getActiveWebcam() != frontWebcam? frontWebcam: rearWebcam); - } - passToTeleOp = false; - } break; case B: diff --git a/TeamCode/src/main/java/trclib b/TeamCode/src/main/java/trclib index 315029e..2e8ab0d 160000 --- a/TeamCode/src/main/java/trclib +++ b/TeamCode/src/main/java/trclib @@ -1 +1 @@ -Subproject commit 315029e4399da9945b793415820434be0fbb3bc4 +Subproject commit 2e8ab0dd1b87661a5521f20c1e6540e592f099bb