From badfe9ecf2436d1d5394e4716e5944048b6c93f6 Mon Sep 17 00:00:00 2001 From: Fritz Geib Date: Mon, 15 Apr 2024 15:20:36 -0400 Subject: [PATCH] [#543] talking is in fact hard --- 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 8cfa13f9..7630b51d 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -256,7 +256,7 @@ protected void configureButtonBindings() { new Trigger(() -> driver.getPOV() == 0).toggleOnTrue(leds.enableState(LED_STATES.DISABLED)); /* COPILOT */ - new Trigger(coPilot::getBButton) + new Trigger(() -> (coPilot.getBButton() && !driver.getRightBumper())) .whileTrue(new InstantCommand(() -> flywheel.stop(), flywheel) .andThen(new SmartCollect(() -> 0.65, () -> 0.9, collector, indexer, pivot, flywheel)) .deadlineWith(leds.enableState(LED_STATES.COLLECTING))); @@ -266,7 +266,7 @@ protected void configureButtonBindings() { // .deadlineWith(leds.enableState(LED_STATES.COLLECTING).withTimeout(1))); // cand shots for the robot - new Trigger(coPilot::getXButton) + new Trigger(() -> coPilot.getXButton() && !driver.getAButton()) .whileTrue(new PointBlankShot(flywheel, pivot).deadlineWith(leds.enableState(LED_STATES.SHOOTING))); // new Trigger(coPilot::getYButton).whileTrue(new PivotUP(pivot)); // new Trigger(coPilot::getYButton).whileTrue(new NotePass(drivetrain, flywheel, pivot, driver, indexer));