From 4ba10a124e32dd90db0d7a9337b2a32da5f961f1 Mon Sep 17 00:00:00 2001 From: "Keenan D. Buckley" Date: Fri, 8 Mar 2019 16:15:58 -0700 Subject: [PATCH] Rename buttons to better reflect thier function --- .../main/java/org/usfirst/frc4388/robot/OI.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 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 3c5a14a..360e005 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java @@ -56,17 +56,15 @@ public class OI Contract.whenPressed(new WristPlacement(false)); - JoystickButton liftBothIntake = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.X_BUTTON); - liftBothIntake.whenPressed(new HatchAndBallSet(false, false)); + JoystickButton deployBothIntakes = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.X_BUTTON); + deployBothIntakes.whenPressed(new HatchAndBallSet(false, false)); - JoystickButton liftHatchIntake = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.RIGHT_BUMPER_BUTTON); - liftHatchIntake.whenPressed(new HatchAndBallSet(false, true)); - - - JoystickButton liftBallIntake = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.LEFT_BUMPER_BUTTON); - //liftBallIntake.whenPressed(new HatchFlip(false)); - liftBallIntake.whenPressed(new HatchAndBallSet(true, false)); + JoystickButton deployBallIntake = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.RIGHT_BUMPER_BUTTON); + deployBallIntake.whenPressed(new HatchAndBallSet(false, true)); + JoystickButton deployHatchIntake = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.LEFT_BUMPER_BUTTON); + deployHatchIntake.whenPressed(new HatchAndBallSet(true, false)); + JoystickButton climbUp = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.RIGHT_TRIGGER_AXIS); JoystickButton climbDown = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.LEFT_TRIGGER_AXIS);