diff --git a/src/main/deploy/Robot Data - Distances.csv b/src/main/deploy/Robot Data - Distances.csv index e33cc7b..fa7b05c 100644 --- a/src/main/deploy/Robot Data - Distances.csv +++ b/src/main/deploy/Robot Data - Distances.csv @@ -2,6 +2,4 @@ Distance (in),Hood Ext. (u),Drum Velocity (u/ds),Center Displacment (deg) 70,20,7000,2.5, 127,27,8467,2, 223,31.25,10398,2.75, -272,32.4,11776,2.5, -342,33,13733,2, -458,30.5,17000,0, \ No newline at end of file +245,31,18000,1, diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 34a2360..01e56ae 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -236,14 +236,14 @@ public class RobotContainer { // extends or retracts the extender new JoystickButton(getOperatorJoystick(), XboxController.X_BUTTON) - //.whileHeld(new RunCommand(() -> m_robotIntake.runExtender(0.5))) - //.whenReleased(new InstantCommand(() -> m_robotIntake.runExtender(0))); - .whileHeld(new RunCommand(() -> m_robotShooterHood.runHood(0.2), m_robotShooterHood)); + .whileHeld(new RunCommand(() -> m_robotIntake.runExtender(0.5))) + .whenReleased(new InstantCommand(() -> m_robotIntake.runExtender(0))); + //.whileHeld(new RunCommand(() -> m_robotShooterHood.runHood(0.2), m_robotShooterHood)); new JoystickButton(getOperatorJoystick(), XboxController.Y_BUTTON) - //.whileHeld(new RunCommand(() -> m_robotIntake.runExtender(-0.5))) - //.whenReleased(new InstantCommand(() -> m_robotIntake.runExtender(0))); - .whileHeld(new RunCommand(() -> m_robotShooterHood.runHood(-0.2), m_robotShooterHood)); + .whileHeld(new RunCommand(() -> m_robotIntake.runExtender(-0.5))) + .whenReleased(new InstantCommand(() -> m_robotIntake.runExtender(0))); + //.whileHeld(new RunCommand(() -> m_robotShooterHood.runHood(-0.2), m_robotShooterHood)); // safety for climber and leveler new JoystickButton(getOperatorJoystick(), XboxController.BACK_BUTTON)