Merge pull request #38 from OakvilleDynamics/event/stlouis-regional

Event/stlouis regional
OakvilleDynamics · Mar 23, 2024 · 384ebad · 384ebad
2 parents 3b4573c + 5db008e
commit 384ebad
Show file tree

Hide file tree

Showing 32 changed files with 356 additions and 457 deletions.
diff --git a/...in/deploy/pathplanner/autos/BLS Auto.auto → ...pathplanner/autos/BLUE AMP SIDE Auto.auto b/...in/deploy/pathplanner/autos/BLS Auto.auto → ...pathplanner/autos/BLUE AMP SIDE Auto.auto
@@ -2,10 +2,10 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 0.7275269251393154,
-      "y": 4.268366371490578
+      "x": 0.4234789096358818,
+      "y": 6.981410202136645
     },
-    "rotation": 58.172553423326896
+    "rotation": 2.145150039040434
   },
   "command": {
     "type": "sequential",
@@ -14,13 +14,13 @@
         {
           "type": "named",
           "data": {
-            "name": "shootConveyor"
+            "name": "SHOOTCONVEYOR"
           }
         },
         {
           "type": "named",
           "data": {
-            "name": "shootFlyWheel"
+            "name": "SHOOTFLYS"
           }
         },
         {

diff --git a/...in/deploy/pathplanner/autos/BMS Auto.auto → ...planner/autos/BLUE Middle Shoot Auto.auto b/...in/deploy/pathplanner/autos/BMS Auto.auto → ...planner/autos/BLUE Middle Shoot Auto.auto
@@ -2,8 +2,8 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 5.849566570928014,
-      "y": 4.315142989260338
+      "x": 1.3674277229789629,
+      "y": 5.557362183607978
     },
     "rotation": 0
   },
@@ -12,27 +12,27 @@
     "data": {
       "commands": [
         {
-          "type": "path",
+          "type": "named",
           "data": {
-            "pathName": "BS Path"
+            "name": "SHOOTCONVEYOR"
           }
         },
         {
           "type": "named",
           "data": {
-            "name": "shootConveyor"
+            "name": "SHOOTFLYS"
           }
         },
         {
-          "type": "named",
+          "type": "wait",
           "data": {
-            "name": "shootFlyWheel"
+            "waitTime": 2.0
           }
         },
         {
-          "type": "wait",
+          "type": "path",
           "data": {
-            "waitTime": 2.0
+            "pathName": "BS Path"
           }
         }
       ]

diff --git a/...in/deploy/pathplanner/autos/BRS Auto.auto → ...hplanner/autos/BLUE SOURCE SIDE Auto.auto b/...in/deploy/pathplanner/autos/BRS Auto.auto → ...hplanner/autos/BLUE SOURCE SIDE Auto.auto
@@ -5,7 +5,7 @@
       "x": 0.79769185179396,
       "y": 4.572414386994017
     },
-    "rotation": -62.59242456218156
+    "rotation": -125.24061873233006
   },
   "command": {
     "type": "sequential",
@@ -14,13 +14,13 @@
         {
           "type": "named",
           "data": {
-            "name": "shootConveyor"
+            "name": "SHOOTCONVEYOR"
           }
         },
         {
           "type": "named",
           "data": {
-            "name": "shootFlyWheel"
+            "name": "SHOOTFLYS"
           }
         },
         {

diff --git a/...ain/deploy/pathplanner/autos/BR Path.auto → ...n/deploy/pathplanner/autos/BLUE TAXI.auto b/...ain/deploy/pathplanner/autos/BR Path.auto → ...n/deploy/pathplanner/autos/BLUE TAXI.auto
@@ -2,8 +2,8 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 1.107671952684762,
-      "y": 2.4888707299839377
+      "x": 0.400090600751002,
+      "y": 1.9997004096572308
     },
     "rotation": 0
   },

diff --git a/...in/deploy/pathplanner/autos/RRS Auto.auto → .../pathplanner/autos/RED AMP SIDE Auto.auto b/...in/deploy/pathplanner/autos/RRS Auto.auto → .../pathplanner/autos/RED AMP SIDE Auto.auto
@@ -2,10 +2,10 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 15.976704318081,
-      "y": 4.408696224799858
+      "x": 16.147134266099517,
+      "y": 6.9085276198721415
     },
-    "rotation": -120.5792268724892
+    "rotation": 0.0
   },
   "command": {
     "type": "sequential",
@@ -14,13 +14,13 @@
         {
           "type": "named",
           "data": {
-            "name": "shootConveyor"
+            "name": "SHOOTCONVEYOR"
           }
         },
         {
           "type": "named",
           "data": {
-            "name": "shootFlyWheel"
+            "name": "SHOOTFLYS"
           }
         },
         {
@@ -32,7 +32,7 @@
         {
           "type": "path",
           "data": {
-            "pathName": "RRS Path"
+            "pathName": "Straight Red Amp Path"
           }
         }
       ]

diff --git a/...in/deploy/pathplanner/autos/RMS Auto.auto → ...hplanner/autos/RED Middle Shoot Auto.auto b/...in/deploy/pathplanner/autos/RMS Auto.auto → ...hplanner/autos/RED Middle Shoot Auto.auto
@@ -2,8 +2,8 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 15.146419352667763,
-      "y": 5.578111669043852
+      "x": 15.319384055583853,
+      "y": 5.551187918118234
     },
     "rotation": 0
   },
@@ -12,27 +12,27 @@
     "data": {
       "commands": [
         {
-          "type": "path",
+          "type": "named",
           "data": {
-            "pathName": "RS Path"
+            "name": "SHOOTCONVEYOR"
           }
         },
         {
           "type": "named",
           "data": {
-            "name": "shootConveyor"
+            "name": "SHOOTFLYS"
           }
         },
         {
-          "type": "named",
+          "type": "wait",
           "data": {
-            "name": "shootFlyWheel"
+            "waitTime": 2.0
           }
         },
         {
-          "type": "wait",
+          "type": "path",
           "data": {
-            "waitTime": 2.0
+            "pathName": "RS Path"
           }
         }
       ]

diff --git a/...ain/deploy/pathplanner/autos/RL Path.auto → ...thplanner/autos/RED SOURCE SIDE Auto.auto b/...ain/deploy/pathplanner/autos/RL Path.auto → ...thplanner/autos/RED SOURCE SIDE Auto.auto
@@ -2,10 +2,10 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 15.541771563143822,
-      "y": 2.430613727257548
+      "x": 16.1521166347176,
+      "y": 4.234725089168489
     },
-    "rotation": -179.1864566650106
+    "rotation": -1.7858847665219348
   },
   "command": {
     "type": "sequential",
@@ -14,7 +14,7 @@
         {
           "type": "path",
           "data": {
-            "pathName": "RL Path"
+            "pathName": "RRS Path"
           }
         }
       ]

diff --git a/src/main/deploy/pathplanner/autos/RED TAXI.auto b/src/main/deploy/pathplanner/autos/RED TAXI.auto
@@ -0,0 +1,25 @@
+{
+  "version": 1.0,
+  "startingPose": {
+    "position": {
+      "x": 16.112410901029318,
+      "y": 2.0413098429059118
+    },
+    "rotation": 0
+  },
+  "command": {
+    "type": "sequential",
+    "data": {
+      "commands": [
+        {
+          "type": "path",
+          "data": {
+            "pathName": "RR Path"
+          }
+        }
+      ]
+    }
+  },
+  "folder": null,
+  "choreoAuto": false
+}
diff --git a/src/main/deploy/pathplanner/autos/RLS Auto.auto b/src/main/deploy/pathplanner/autos/RLS Auto.auto
diff --git a/src/main/deploy/pathplanner/autos/bl Auto.auto b/src/main/deploy/pathplanner/autos/bl Auto.auto
diff --git a/src/main/deploy/pathplanner/autos/rr Auto.auto b/src/main/deploy/pathplanner/autos/rr Auto.auto