changed amp back to manip

Author: Vignesh1234587

src/main/java/frc/robot/BuildConstants.java

@@ -5,12 +5,12 @@ public final class BuildConstants {
   public static final String MAVEN_GROUP = "";
   public static final String MAVEN_NAME = "2024 Robot Code";
   public static final String VERSION = "unspecified";
-  public static final int GIT_REVISION = 320;
-  public static final String GIT_SHA = "2c89f93b696e8f38145ff3ece9139d637201b983";
-  public static final String GIT_DATE = "2024-08-10 19:14:18 EDT";
+  public static final int GIT_REVISION = 321;
+  public static final String GIT_SHA = "595783aa307f432a03116af1c4f77599478ee51c";
+  public static final String GIT_DATE = "2024-08-12 20:54:55 EDT";
   public static final String GIT_BRANCH = "amp-bar";
-  public static final String BUILD_DATE = "2024-08-12 20:49:44 EDT";
-  public static final long BUILD_UNIX_TIME = 1723510184499L;
+  public static final String BUILD_DATE = "2024-08-13 23:59:25 EDT";
+  public static final long BUILD_UNIX_TIME = 1723607965830L;
   public static final int DIRTY = 1;
 
   private BuildConstants() {}

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

@@ -837,24 +837,24 @@ private void driverControls() {
     driveAButton.onTrue(climbCommands);
 
     driveXButton.onTrue(trapCommands);
-    driveController
-        .b()
-        .onTrue(
-            new InstantCommand(() -> pivot.setShootState(SHOOT_STATE.AMP))
-                .andThen(new ScoreAmp(elevator, pivot, shooter, drive)));
+    // driveController
+    //     .b()
+    //     .onTrue(
+    //         new InstantCommand(() -> pivot.setShootState(SHOOT_STATE.AMP))
+    //             .andThen(new ScoreAmp(elevator, pivot, shooter, drive)));
 
-    driveController
-        .b()
-        .onFalse(
-            new InstantCommand(() -> pivot.setShootState(SHOOT_STATE.AIMBOT))
-                .andThen(
-                    new SequentialCommandGroup(
-                        new SetAmpBarTarget(5, 3, elevator),
-                        new InstantCommand(() -> shooter.turnOffFan()),
-                        new SetElevatorTarget(0, 0.5, elevator),
-                        new InstantCommand(() -> elevator.setConstraints(30, 85)),
-                        new InstantCommand(() -> shooter.stopFlywheels(), shooter),
-                        new SetPivotTarget(Constants.PivotConstants.STOW_SETPOINT_DEG, pivot))));
+    // driveController
+    //     .b()
+    //     .onFalse(
+    //         new InstantCommand(() -> pivot.setShootState(SHOOT_STATE.AIMBOT))
+    //             .andThen(
+    //                 new SequentialCommandGroup(
+    //                     new SetAmpBarTarget(5, 3, elevator),
+    //                     new InstantCommand(() -> shooter.turnOffFan()),
+    //                     new SetElevatorTarget(0, 0.5, elevator),
+    //                     new InstantCommand(() -> elevator.setConstraints(30, 85)),
+    //                     new InstantCommand(() -> shooter.stopFlywheels(), shooter),
+    //                     new SetPivotTarget(Constants.PivotConstants.STOW_SETPOINT_DEG, pivot))));
     // driveController
     //     .rightBumper()
     //     .whileTrue(
@@ -911,6 +911,7 @@ private void manipControls() {
         new InstantCommand(() -> pivot.setShootState(SHOOT_STATE.AIMBOT))
             .andThen(
                 new SequentialCommandGroup(
+                    new SetAmpBarTarget(5, 3, elevator),
                     new InstantCommand(() -> shooter.turnOffFan()),
                     new SetElevatorTarget(0, 0.5, elevator),
                     new InstantCommand(() -> elevator.setConstraints(30, 85)),