diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index d1386ac..7b0d283 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -82,7 +82,7 @@ public class RobotContainer { */ private void configureBindings() { // These let the driver set the shooter hood position using the controller. - m_driverController.rightBumper().onTrue(Commands.parallel(intakeSubsystem.intake(m_driverController.getHID()))); + m_driverController.rightBumper().onTrue(Commands.parallel(intakeSubsystem.intakeNO())); m_driverController.start().whileTrue(intakeSubsystem.resetDeploy()); m_driverController.x().toggleOnTrue(new UltraShooterCommand(hopperSubsystem, turretSubsystem, driveSubsystem)); m_driverController.b().whileTrue(new Reverse(intakeSubsystem, hopperSubsystem, m_driverController.getHID())); diff --git a/src/main/java/frc/robot/subsystems/IntakeSubsystem.java b/src/main/java/frc/robot/subsystems/IntakeSubsystem.java index 40e8175..e948d94 100644 --- a/src/main/java/frc/robot/subsystems/IntakeSubsystem.java +++ b/src/main/java/frc/robot/subsystems/IntakeSubsystem.java @@ -68,6 +68,11 @@ public class IntakeSubsystem extends TestableSubsystem { }); } + public Command intakeNO() { + return this.runOnce(() -> + {setSpeed(-.45);}); + } + public Command intakeNR() { return this.runOnce(() -> {if (intakeMotor.get() == 0) {setSpeed(-.45);} else {intakeMotor.stopMotor();}});