diff --git a/CompSeasonBot2021/src/main/java/frc/robot/RobotContainer.java b/CompSeasonBot2021/src/main/java/frc/robot/RobotContainer.java index 53b342a..b89583f 100644 --- a/CompSeasonBot2021/src/main/java/frc/robot/RobotContainer.java +++ b/CompSeasonBot2021/src/main/java/frc/robot/RobotContainer.java @@ -201,7 +201,7 @@ private void configureButtonBindings() { logitecLeftTrigger.whenReleased(new RetractIntake(intake)); //Run intake rollers and ball feed to pickup balls regardles of intake position - logitecLeftBumper.whileHeld(new RunIntakeAndBallFeed(intake, ballFeed, .61, .75));// Speeds as previously determined + logitecLeftBumper.whenHeld(new RunIntakeAndBallFeed(intake, ballFeed, .61, .75), true);// Speeds as previously determined //Raise or lower the climber hook with up and down D-pad buttons. Move while pressed, stop when released. //Allows operator to position the climber hook on the bar. diff --git a/CompSeasonBot2021/src/main/java/frc/robot/commands/RetractIntake.java b/CompSeasonBot2021/src/main/java/frc/robot/commands/RetractIntake.java index 7acb41f..1da6362 100644 --- a/CompSeasonBot2021/src/main/java/frc/robot/commands/RetractIntake.java +++ b/CompSeasonBot2021/src/main/java/frc/robot/commands/RetractIntake.java @@ -28,6 +28,7 @@ public void execute() { // Called once the command ends or is interrupted. @Override public void end(boolean interrupted) { + } // Returns true when the command should end. diff --git a/CompSeasonBot2021/src/main/java/frc/robot/commands/RunIntakeAndBallFeed.java b/CompSeasonBot2021/src/main/java/frc/robot/commands/RunIntakeAndBallFeed.java index 5844700..914bfab 100644 --- a/CompSeasonBot2021/src/main/java/frc/robot/commands/RunIntakeAndBallFeed.java +++ b/CompSeasonBot2021/src/main/java/frc/robot/commands/RunIntakeAndBallFeed.java @@ -42,6 +42,7 @@ public void execute() { // Called once the command ends or is interrupted. @Override public void end(boolean interrupted) { + intake.stopIntake(); ballFeed.stopBallFeedMotor(); }