From 76f696d5a6cd3e12a003f4985791534f9248266a Mon Sep 17 00:00:00 2001 From: "Keenan D. Buckley" Date: Mon, 11 Mar 2019 16:07:10 -0600 Subject: [PATCH] Climber Fix Forces the climber wheels to be set to zero when safety switch is off. --- 2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java | 7 ++++--- .../java/org/usfirst/frc4388/robot/subsystems/Climber.java | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java index 34bf95c..be7a95d 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java @@ -73,9 +73,10 @@ public class OI JoystickButton climbUp = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.RIGHT_TRIGGER_AXIS); JoystickButton climbDown = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.LEFT_TRIGGER_AXIS); - JoystickButton ratchetFlip = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.Y_BUTTON); - ratchetFlip.whenPressed(new ratchetFlip(0.5)); - ratchetFlip.whenReleased(new ratchetFlip(0)); + /** DEPRICATED, TRIGGERS ON THE DRIVER JOYSTICK COVER FOR THIS BUTTON */ + //JoystickButton ratchetFlip = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.Y_BUTTON); + //ratchetFlip.whenPressed(new ratchetFlip(0.5)); + //ratchetFlip.whenReleased(new ratchetFlip(0)); JoystickButton shiftUp = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.RIGHT_BUMPER_BUTTON); shiftUp.whenPressed(new DriveSpeedShift(true)); diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java index 00e53d9..ed8966d 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java @@ -116,6 +116,7 @@ public class Climber extends Subsystem{ } else { climberBack.set(rightTriggerInput); + climberFront.set(0); } }