|
43 | 43 | import frc.robot.Constants.OIConstants;
|
44 | 44 | import frc.robot.auto.groups.FiveBallAuto;
|
45 | 45 | import frc.robot.auto.groups.FourBallAuto;
|
46 |
| -import frc.robot.auto.groups.NewAuto; |
| 46 | +import frc.robot.auto.groups.NewFiveBallAuto; |
47 | 47 | import frc.robot.auto.groups.TwoBallEastAuto;
|
48 | 48 | import frc.robot.auto.groups.TwoBallSouthAuto;
|
49 | 49 | import frc.robot.climber.Climber;
|
@@ -163,7 +163,7 @@ public Command getAutonomousCommand() {
|
163 | 163 | */
|
164 | 164 | }
|
165 | 165 | // return autoCommand;
|
166 |
| - return new NewAuto(mDrive, mShooter, mIntake); |
| 166 | + return new NewFiveBallAuto(mDrive, mShooter, mIntake); |
167 | 167 | }
|
168 | 168 |
|
169 | 169 | public void displaySwitch() {
|
@@ -238,8 +238,8 @@ public void configureButtonBindings() {
|
238 | 238 | new JoystickButton(driver, RMZ_D_IN).whenPressed(new PullTrigger(mShooter));
|
239 | 239 | new JoystickButton(driver, RMZ_D_IN).whenReleased(new StopTrigger(mShooter));
|
240 | 240 |
|
241 |
| - new JoystickButton(driver, RMZ_H_IN).whenPressed(new ResetHood(mShooter)); |
242 |
| - new JoystickButton(driver, RMZ_G_IN).whenReleased(new ZeroHeading(mDrive)); |
| 241 | +// new JoystickButton(driver, RMZ_H_IN).whenPressed(new ResetHood(mShooter)); |
| 242 | + new JoystickButton(driver, RMZ_G_IN).and(new JoystickButton(driver, RMZ_H_IN).whenPressed(new ZeroHeading(mDrive))); |
243 | 243 |
|
244 | 244 |
|
245 | 245 | new JoystickButton(driver, RMZ_F_UP).whenHeld(new AbsoluteOrientation(mDrive, joysticks));
|
|
0 commit comments