Merge branch 'main' into add-auton-action-shutdown

WTMCRobotics · Feb 28, 2024 · 7e54a51 · 7e54a51
2 parents 2d26560 + 5fcd1a1
commit 7e54a51
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/frc/robot/InputtedCoDriverControls.java b/src/main/java/frc/robot/InputtedCoDriverControls.java
@@ -14,20 +14,20 @@ public static void setCoDriverController(XboxController xboxController) {
     }
 
     public static void onEveryFrame() {
-        Robot.motors.getLeftClimb().stopMotor();
-        Robot.motors.getRightClimb().stopMotor();
+        Robot.motors.getFeeder().stopMotor();
         if (controller.getAButton()) {
             Robot.motors.getFeeder().set(30);
-        } else {
-            Robot.motors.getFeeder().set(0);
         }
         if (controller.getXButtonPressed()) {
             shootIntoSpeaker();
         }
         doShooterIntake();
+        Robot.motors.getIntake().stopMotor();
         if (controller.getYButton()) {
             doFloorIntake();
         }
+        Robot.motors.getLeftClimb().stopMotor();
+        Robot.motors.getRightClimb().stopMotor();
         if (controller.getStartButton()) {
             //extendArms();
             Robot.motors.getLeftClimb().set(Constants.CLIMB_EXTENSION_SPEED);