From 7564a64832a386b4323162d300fcad45774696b9 Mon Sep 17 00:00:00 2001 From: "Jason M. Dudley" Date: Sat, 11 Apr 2026 09:18:49 -0500 Subject: [PATCH 1/3] Remove duplicate bindings --- src/main/java/frc/robot/RobotContainer.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 201aa90..d1c5ca4 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -517,19 +517,6 @@ public void configureBindings() { new Trigger(() -> operatorController.getLeftTriggerAxis() > 0.5 || operatorController.getRightTriggerAxis() > 0.5) .onTrue(new InstantCommand(() -> shooterPercent.set(Constants.Operator.ErrorSettings.SHOOTER_PERCENT_DEFAULT))); - new Trigger( - () -> operatorController.getAButton()).onTrue( - new InstantCommand(() -> selectedFixedTarget = FixedTarget.A)); - - new Trigger( - () -> operatorController.getBButton()).onTrue( - new InstantCommand(() -> selectedFixedTarget = FixedTarget.B)); - - new Trigger( - () -> operatorController.getXButton()).onTrue( - new InstantCommand(() -> xHeld = true)) - .onFalse( - new InstantCommand(() -> xHeld = false)); } From 74a3af055517063c40245c6d836d598d6a246cd2 Mon Sep 17 00:00:00 2001 From: "Jason M. Dudley" Date: Sat, 11 Apr 2026 09:29:47 -0500 Subject: [PATCH 2/3] Fix team number check --- src/main/java/frc/robot/RobotContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index d1c5ca4..12f9f79 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -320,7 +320,7 @@ public void configureBindings() { detectedRobot = raycast.getRobot(teamNumber, 1); } - if (teamNumber > 0) { + if (teamNumber <= 0) { detectedRobot = Optional.empty(); } From cc1d411c074c3bc43181ef1ac8f6d178828fe6b9 Mon Sep 17 00:00:00 2001 From: "Jason M. Dudley" Date: Sat, 11 Apr 2026 09:41:03 -0500 Subject: [PATCH 3/3] New controls, moved x lock to driver options (hamberger) button --- src/main/java/frc/robot/RobotContainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 12f9f79..59d6ce7 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -388,8 +388,8 @@ public void configureBindings() { Trigger reverseTransferTrigger = new Trigger(() -> driverController.getYButton()); - // Driver X button: hold to lock robot pose (X-lock) - Trigger xLockTrigger = new Trigger(() -> driverController.getXButton()); + // Operator Start button: hold to lock robot pose (X-lock) + Trigger xLockTrigger = new Trigger(() -> operatorController.getStartButton()); xLockTrigger.whileTrue(driveSubsystem.getLockPoseCommand()); /* Shooter runs while button held */