Merge pull request #8 from frc2204/pp_parallel_cmd_fix

fixed parallel cmd group error in pp
frc2204 · Apr 1, 2024 · 487ac8d · 487ac8d
2 parents e9d64f2 + 2dbddff
commit 487ac8d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/src/main/deploy/pathplanner/autos/Start 1 1st Ring Yes Auto.auto b/src/main/deploy/pathplanner/autos/Start 1 1st Ring Yes Auto.auto
@@ -106,16 +106,16 @@
                 "data": {
                   "name": "stopShooter"
                 }
-              },
-              {
-                "type": "named",
-                "data": {
-                  "name": "stopIntake"
-                }
               }
             ]
           }
         },
+        {
+          "type": "named",
+          "data": {
+            "name": "stopIntake"
+          }
+        },
         {
           "type": "named",
           "data": {

diff --git a/src/main/deploy/pathplanner/autos/Start 1 3rd Pickup Yes Auto.auto b/src/main/deploy/pathplanner/autos/Start 1 3rd Pickup Yes Auto.auto
@@ -75,16 +75,16 @@
                 "data": {
                   "name": "stopShooter"
                 }
-              },
-              {
-                "type": "named",
-                "data": {
-                  "name": "stopIntake"
-                }
               }
             ]
           }
         },
+        {
+          "type": "named",
+          "data": {
+            "name": "stopIntake"
+          }
+        },
         {
           "type": "named",
           "data": {

diff --git a/src/main/java/org/rambots/BuildConstants.java b/src/main/java/org/rambots/BuildConstants.java
@@ -7,12 +7,12 @@ public final class BuildConstants {
   public static final String MAVEN_GROUP = "";
   public static final String MAVEN_NAME = "frc-2024.2";
   public static final String VERSION = "unspecified";
-  public static final int GIT_REVISION = 47;
-  public static final String GIT_SHA = "620c2c3e6ebfb2b9e742b9cd48ae7f2e66e32538";
-  public static final String GIT_DATE = "2024-03-27 17:36:31 PDT";
-  public static final String GIT_BRANCH = "jay/Autos/temp";
-  public static final String BUILD_DATE = "2024-04-01 10:25:27 PDT";
-  public static final long BUILD_UNIX_TIME = 1711992327275L;
+  public static final int GIT_REVISION = 49;
+  public static final String GIT_SHA = "e9d64f245462c6e238087c94b64507ad8b59f3d6";
+  public static final String GIT_DATE = "2024-04-01 10:33:42 PDT";
+  public static final String GIT_BRANCH = "test";
+  public static final String BUILD_DATE = "2024-04-01 16:40:36 PDT";
+  public static final long BUILD_UNIX_TIME = 1712014836652L;
   public static final int DIRTY = 1;
 
   private BuildConstants(){}