From 948627f0e79401f13b370779993c0783e72a23a9 Mon Sep 17 00:00:00 2001 From: Titan Robotics Club Date: Thu, 22 Aug 2024 01:54:29 -0700 Subject: [PATCH] Updated ftclib. Minor cleanup. --- TeamCode/src/main/java/ftclib | 2 +- .../src/main/java/teamcode/FtcTeleOp.java | 20 +++++++++---------- TeamCode/src/main/java/teamcode/FtcTest.java | 2 -- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/TeamCode/src/main/java/ftclib b/TeamCode/src/main/java/ftclib index 95bc3dc..bb8d83c 160000 --- a/TeamCode/src/main/java/ftclib +++ b/TeamCode/src/main/java/ftclib @@ -1 +1 @@ -Subproject commit 95bc3dcdcd1ccb16a2a884b80322fa295ea894f2 +Subproject commit bb8d83c66a491571f806f496389d6e7f0b8004c7 diff --git a/TeamCode/src/main/java/teamcode/FtcTeleOp.java b/TeamCode/src/main/java/teamcode/FtcTeleOp.java index ba4c1ca..12b605f 100644 --- a/TeamCode/src/main/java/teamcode/FtcTeleOp.java +++ b/TeamCode/src/main/java/teamcode/FtcTeleOp.java @@ -260,8 +260,6 @@ public class FtcTeleOp extends FtcOpMode break; case B: - break; - case X: break; @@ -322,6 +320,15 @@ public class FtcTeleOp extends FtcOpMode case DpadRight: break; + case Back: + if (pressed && robot.robotDrive != null && robot.robotDrive instanceof FtcSwerveDrive) + { + // Drive base is a Swerve Drive, align all steering wheels forward. + robot.globalTracer.traceInfo(moduleName, ">>>>> Set SteerAngle to zero."); + ((FtcSwerveDrive) robot.robotDrive).setSteerAngle(0.0, false, false); + } + break; + case Start: if (robot.vision != null && robot.vision.aprilTagVision != null && robot.robotDrive != null) { @@ -345,15 +352,6 @@ public class FtcTeleOp extends FtcOpMode } } break; - - case Back: - if (pressed && robot.robotDrive != null && robot.robotDrive instanceof FtcSwerveDrive) - { - // Drive base is a Swerve Drive, align all steering wheels forward. - robot.globalTracer.traceInfo(moduleName, ">>>>> Set SteerAngle to zero."); - ((FtcSwerveDrive) robot.robotDrive).setSteerAngle(0.0, false, false); - } - break; } } //driverButtonEvent diff --git a/TeamCode/src/main/java/teamcode/FtcTest.java b/TeamCode/src/main/java/teamcode/FtcTest.java index cceef69..910795a 100644 --- a/TeamCode/src/main/java/teamcode/FtcTest.java +++ b/TeamCode/src/main/java/teamcode/FtcTest.java @@ -756,8 +756,6 @@ public class FtcTest extends FtcTeleOp break; case Back: - break; - case Start: break; }