Skip to content

Commit e61e67a

Browse files
committed
Update at 'Thu Apr 17 11:21:29 EDT 2025'
1 parent 9728b44 commit e61e67a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/java/frc/robot/RobotContainer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,16 +311,16 @@ private void configureBindings() {
311311
s_Shooter.shoot()
312312
))
313313
.onFalse(new InstantCommand(()->joystick.setRumble(RumbleType.kBothRumble, 0))
314-
.andThen(s_Shooter.stop().andThen(new RunCommand(() -> stopDrive()))));
314+
.andThen(Commands.parallel(s_Shooter.stop(), new RunCommand(() -> stopDrive(), drivetrain))));
315315

316316
// stop the robot override
317317
joystick.button(7).whileTrue(new RunCommand(()-> {System.out.println("STOP");stopDrive(); }, drivetrain));
318318

319319
// auto align left
320320
joystick.x().whileTrue(Commands.parallel(new DriveToPose(drivetrain,
321321
new Transform2d(Units.inchesToMeters(-33.5/2+0.25), Units.inchesToMeters(13.5+2.25),
322-
new Rotation2d()), joystick),s_Shooter.shoot())).onFalse(new InstantCommand(()->joystick.setRumble(RumbleType.kBothRumble, 0))
323-
.andThen(s_Shooter.stop().andThen(new RunCommand(() -> stopDrive()))));
322+
new Rotation2d()), joystick),s_Shooter.shoot())).onFalse(new InstantCommand(()->joystick.setRumble(RumbleType.kBothRumble, 0))
323+
.andThen(Commands.parallel(s_Shooter.stop(), new RunCommand(() -> stopDrive(), drivetrain))));
324324

325325
// joystick.povDown().whileTrue(Commands.parallel(new DriveToPose(drivetrain,
326326
// new Transform2d(Units.inchesToMeters(-33.5/1.5), Units.inchesToMeters(0)

0 commit comments

Comments
 (0)