Merge pull request #548 from frc-862/COMP-Worlds

[COMP] Worlds
frc-862 · Apr 30, 2024 · 6180f26 · 6180f26
2 parents 3f6c338 + ba36364
commit 6180f26
Show file tree

Hide file tree

Showing 42 changed files with 484 additions and 590 deletions.
diff --git a/.pathplanner/settings.json b/.pathplanner/settings.json
@@ -9,7 +9,10 @@
     "Silly",
     "Top side paths"
   ],
-  "autoFolders": [],
+  "autoFolders": [
+    "LOL",
+    "CAND"
+  ],
   "defaultMaxVel": 5.0,
   "defaultMaxAccel": 4.0,
   "defaultMaxAngVel": 540.0,

diff --git a/src/main/deploy/pathplanner/autos/2-SB-[C3]-EC.auto b/src/main/deploy/pathplanner/autos/2-SB-[C3]-EC.auto
@@ -121,6 +121,6 @@
       ]
     }
   },
-  "folder": null,
+  "folder": "CAND",
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/2-SB-[F4]-EC.auto b/src/main/deploy/pathplanner/autos/2-SB-[F4]-EC.auto
@@ -0,0 +1,76 @@
+{
+  "version": 1.0,
+  "startingPose": null,
+  "command": {
+    "type": "sequential",
+    "data": {
+      "commands": [
+        {
+          "type": "race",
+          "data": {
+            "commands": [
+              {
+                "type": "named",
+                "data": {
+                  "name": "Cand-Sub"
+                }
+              },
+              {
+                "type": "wait",
+                "data": {
+                  "waitTime": 3.0
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "SB-F4"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "Chase-Pieces"
+          }
+        },
+        {
+          "type": "deadline",
+          "data": {
+            "commands": [
+              {
+                "type": "path",
+                "data": {
+                  "pathName": "F4-BS-Close"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "deadline",
+          "data": {
+            "commands": [
+              {
+                "type": "named",
+                "data": {
+                  "name": "Cand-Sub"
+                }
+              },
+              {
+                "type": "named",
+                "data": {
+                  "name": "Stop-Drive"
+                }
+              }
+            ]
+          }
+        }
+      ]
+    }
+  },
+  "folder": null,
+  "choreoAuto": false
+}
diff --git a/src/main/deploy/pathplanner/autos/2-SF-[C2]-EC.auto b/src/main/deploy/pathplanner/autos/2-SF-[C2]-EC.auto
@@ -102,6 +102,6 @@
       ]
     }
   },
-  "folder": null,
+  "folder": "CAND",
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/2-ST-[C1]-EC.auto b/src/main/deploy/pathplanner/autos/2-ST-[C1]-EC.auto
@@ -108,6 +108,6 @@
       ]
     }
   },
-  "folder": null,
+  "folder": "CAND",
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/3-SB-[F4-C3]-EC.auto b/src/main/deploy/pathplanner/autos/3-SB-[F4-C3]-EC.auto
@@ -185,6 +185,6 @@
       ]
     }
   },
-  "folder": null,
+  "folder": "LOL",
   "choreoAuto": false
 }
diff --git a/...eploy/pathplanner/autos/2-SB-[F4]-EF.auto → ...oy/pathplanner/autos/3-SB-[F4-F3]-EF.auto b/...eploy/pathplanner/autos/2-SB-[F4]-EF.auto → ...oy/pathplanner/autos/3-SB-[F4-F3]-EF.auto
@@ -43,39 +43,13 @@
               {
                 "type": "path",
                 "data": {
-                  "pathName": "F4-BS"
-                }
-              }
-            ]
-          }
-        },
-        {
-          "type": "race",
-          "data": {
-            "commands": [
-              {
-                "type": "deadline",
-                "data": {
-                  "commands": [
-                    {
-                      "type": "named",
-                      "data": {
-                        "name": "Point-At-Speaker-left"
-                      }
-                    },
-                    {
-                      "type": "named",
-                      "data": {
-                        "name": "preAim"
-                      }
-                    }
-                  ]
+                  "pathName": "F4-BS-Close"
                 }
               },
               {
-                "type": "wait",
+                "type": "named",
                 "data": {
-                  "waitTime": 3.0
+                  "name": "preAim"
                 }
               }
             ]
@@ -88,7 +62,7 @@
               {
                 "type": "named",
                 "data": {
-                  "name": "Smart-Shoot"
+                  "name": "Cand-Sub"
                 }
               },
               {
@@ -103,7 +77,25 @@
         {
           "type": "path",
           "data": {
-            "pathName": "BS-F4"
+            "pathName": "SB-F3"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "Chase-Pieces"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "F3-BS-Close"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "Cand-Sub"
           }
         }
       ]