diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index b753161..8733949 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -120,7 +120,8 @@ public class RobotContainer { // ); private Command RobotRev = new SequentialCommandGroup( - new InstantCommand(() -> m_robotIntake.setMode(IntakeMode.RollerStop), m_robotIntake), + new InstantCommand(() -> m_robotIntake.setMode(IntakeMode.Idle), m_robotIntake), + new InstantCommand(() -> m_robotIntake.rollerStop(), m_robotIntake), new InstantCommand(() -> m_robotShooter.spinUpShooting(), m_robotShooter) ); @@ -282,6 +283,7 @@ public class RobotContainer { //set shooter ready (rev) with left trigger hold new Trigger(() -> getDeadbandedOperatorController().getLeftTriggerAxis() >= 0.5) .onTrue(new InstantCommand(() -> { + m_robotIntake.setMode(IntakeMode.Idle); m_robotIntake.rollerStop(); m_robotShooter.spinUpShooting(); })) diff --git a/src/main/java/frc4388/robot/subsystems/intake/Intake.java b/src/main/java/frc4388/robot/subsystems/intake/Intake.java index 8425c54..c1a90ad 100644 --- a/src/main/java/frc4388/robot/subsystems/intake/Intake.java +++ b/src/main/java/frc4388/robot/subsystems/intake/Intake.java @@ -27,8 +27,7 @@ public class Intake extends SubsystemBase { Retracted, Extending, Retracting, - Idle, - RollerStop + Idle } private IntakeMode mode = IntakeMode.Idle; @@ -91,9 +90,6 @@ public class Intake extends SubsystemBase { case Idle: io.stopArm(); break; - case RollerStop: - io.setRollerOutput(state, 0); - break; } // if (state.retractedLimit){ // this.mode = IntakeMode.Retracted;