auto changes

hammerhead226 · Aug 15, 2024 · b7d02cb · b7d02cb
1 parent 2b21d6b
commit b7d02cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/frc/robot/BuildConstants.java b/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 = 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-reamp";
-  public static final String BUILD_DATE = "2024-08-14 20:13:53 EDT";
-  public static final long BUILD_UNIX_TIME = 1723680833471L;
+  public static final int GIT_REVISION = 328;
+  public static final String GIT_SHA = "2b21d6b98cde049db5aee43e214983d0f90a2076";
+  public static final String GIT_DATE = "2024-08-14 20:38:25 EDT";
+  public static final String GIT_BRANCH = "pre-marc";
+  public static final String BUILD_DATE = "2024-08-14 20:39:57 EDT";
+  public static final long BUILD_UNIX_TIME = 1723682397590L;
   public static final int DIRTY = 1;
 
   private BuildConstants() {}

diff --git a/src/main/java/frc/robot/commands/ScoreAmp.java b/src/main/java/frc/robot/commands/ScoreAmp.java
@@ -20,13 +20,11 @@ public class ScoreAmp extends SequentialCommandGroup {
   /** Creates a new ScoreAmp. */
   public ScoreAmp(Elevator elevator, Pivot pivot, Shooter shooter, Drive drive) {
     addCommands(
-amp-bar
         new ParallelCommandGroup(
             new InstantCommand(() -> elevator.setConstraints(100, 640), elevator),
             new InstantCommand(() -> shooter.setFlywheelRPMs(500, 700), shooter),
             new SetPivotTarget(Constants.PivotConstants.AMP_SETPOINT_DEG, pivot)),
         new SetAmpBarTarget(195, 0, elevator),
-
         new SetElevatorTarget(6, 1, elevator));
 
     // addCommands(