Merge branch 'master' into auto-programming

This commit is contained in:
Aarav Shah
2020-03-07 16:34:21 -07:00
10 changed files with 260 additions and 137 deletions
@@ -172,7 +172,7 @@ public class RobotContainer {
.whenPressed(new InstantCommand(() -> m_robotPneumatics.setShiftState(false), m_robotDrive));
// Disengages the rachet to allow for a climb
new JoystickButton(getOperatorJoystick(), XboxController.BACK_BUTTON)
new JoystickButton(getDriverJoystick(), XboxController.BACK_BUTTON)
.whileHeld(new DisengageRachet(m_robotClimber));
/* Operator Buttons */
@@ -194,6 +194,7 @@ public class RobotContainer {
new JoystickButton(getOperatorJoystick(), XboxController.X_BUTTON)
.whileHeld(new RunCommand(() -> m_robotIntake.runExtender(0.5)))
.whenReleased(new InstantCommand(() -> m_robotIntake.runExtender(0)));
new JoystickButton(getOperatorJoystick(), XboxController.Y_BUTTON)
.whileHeld(new RunCommand(() -> m_robotIntake.runExtender(-0.5)))
.whenReleased(new InstantCommand(() -> m_robotIntake.runExtender(0)));
@@ -343,6 +344,13 @@ public class RobotContainer {
m_robotPneumatics.setShiftState(state);
}
/**
*
*/
public void shiftClimberRachet(boolean state) {
m_robotClimber.shiftServo(state);
}
/**
*
*/