Merge branch 'main' into feature/visualvm-profiler

OakvilleDynamics · Mar 24, 2024 · 2e622b0 · 2e622b0
2 parents 405e3cb + 384ebad
commit 2e622b0
Show file tree

Hide file tree

Showing 36 changed files with 997 additions and 222 deletions.
diff --git a/...ain/deploy/pathplanner/autos/rr Auto.auto → ...pathplanner/autos/BLUE AMP SIDE Auto.auto b/...ain/deploy/pathplanner/autos/rr Auto.auto → ...pathplanner/autos/BLUE AMP SIDE Auto.auto
@@ -2,37 +2,25 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 16.1521166347176,
-      "y": 7.390705607622041
+      "x": 0.4234789096358818,
+      "y": 6.981410202136645
     },
-    "rotation": 0
+    "rotation": 2.145150039040434
   },
   "command": {
     "type": "sequential",
     "data": {
       "commands": [
-        {
-          "type": "path",
-          "data": {
-            "pathName": "rr Path"
-          }
-        },
-        {
-          "type": "named",
-          "data": {
-            "name": "shootConveyor"
-          }
-        },
         {
           "type": "named",
           "data": {
-            "name": "shootFlyWheel"
+            "name": "SHOOTCONVEYOR"
           }
         },
         {
           "type": "named",
           "data": {
-            "name": "dumpBed"
+            "name": "SHOOTFLYS"
           }
         },
         {
@@ -44,7 +32,7 @@
         {
           "type": "path",
           "data": {
-            "pathName": "rr2 Path"
+            "pathName": "BLS Path"
           }
         }
       ]

diff --git a/...ain/deploy/pathplanner/autos/BS Auto.auto → ...planner/autos/BLUE Middle Shoot Auto.auto b/...ain/deploy/pathplanner/autos/BS Auto.auto → ...planner/autos/BLUE Middle Shoot Auto.auto
@@ -2,7 +2,7 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 16.29244648802688,
+      "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/...ain/deploy/pathplanner/autos/bl Auto.auto → ...hplanner/autos/BLUE SOURCE SIDE Auto.auto b/...ain/deploy/pathplanner/autos/bl Auto.auto → ...hplanner/autos/BLUE SOURCE SIDE Auto.auto
@@ -2,37 +2,25 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 0.4217011759439209,
-      "y": 7.400066486593781
+      "x": 0.79769185179396,
+      "y": 4.572414386994017
     },
-    "rotation": 0
+    "rotation": -125.24061873233006
   },
   "command": {
     "type": "sequential",
     "data": {
       "commands": [
-        {
-          "type": "path",
-          "data": {
-            "pathName": "bl Path"
-          }
-        },
-        {
-          "type": "named",
-          "data": {
-            "name": "shootConveyor"
-          }
-        },
         {
           "type": "named",
           "data": {
-            "name": "shootFlyWheel"
+            "name": "SHOOTCONVEYOR"
           }
         },
         {
           "type": "named",
           "data": {
-            "name": "dumpBed"
+            "name": "SHOOTFLYS"
           }
         },
         {
@@ -44,7 +32,7 @@
         {
           "type": "path",
           "data": {
-            "pathName": "bl2 Path"
+            "pathName": "BRS Path"
           }
         }
       ]

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/src/main/deploy/pathplanner/autos/RED AMP SIDE Auto.auto b/src/main/deploy/pathplanner/autos/RED AMP SIDE Auto.auto
@@ -0,0 +1,43 @@
+{
+  "version": 1.0,
+  "startingPose": {
+    "position": {
+      "x": 16.147134266099517,
+      "y": 6.9085276198721415
+    },
+    "rotation": 0.0
+  },
+  "command": {
+    "type": "sequential",
+    "data": {
+      "commands": [
+        {
+          "type": "named",
+          "data": {
+            "name": "SHOOTCONVEYOR"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "SHOOTFLYS"
+          }
+        },
+        {
+          "type": "wait",
+          "data": {
+            "waitTime": 2.0
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "Straight Red Amp Path"
+          }
+        }
+      ]
+    }
+  },
+  "folder": null,
+  "choreoAuto": false
+}
diff --git a/...ain/deploy/pathplanner/autos/RS Auto.auto → ...hplanner/autos/RED Middle Shoot Auto.auto b/...ain/deploy/pathplanner/autos/RS 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/BL Path.auto → ...thplanner/autos/RED SOURCE SIDE Auto.auto b/...ain/deploy/pathplanner/autos/BL Path.auto → ...thplanner/autos/RED SOURCE SIDE Auto.auto
@@ -2,10 +2,10 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 0.71583277069688,
-      "y": 7.110045901003483
+      "x": 16.1521166347176,
+      "y": 4.234725089168489
     },
-    "rotation": 0
+    "rotation": -1.7858847665219348
   },
   "command": {
     "type": "sequential",
@@ -14,7 +14,7 @@
         {
           "type": "path",
           "data": {
-            "pathName": "BL Path"
+            "pathName": "RRS Path"
           }
         }
       ]

diff --git a/...ain/deploy/pathplanner/autos/RR Path.auto → ...in/deploy/pathplanner/autos/RED TAXI.auto b/...ain/deploy/pathplanner/autos/RR Path.auto → ...in/deploy/pathplanner/autos/RED TAXI.auto
@@ -2,10 +2,10 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 16.01178678140832,
-      "y": 7.028186819906402
+      "x": 16.112410901029318,
+      "y": 2.0413098429059118
     },
-    "rotation": 180.0
+    "rotation": 0
   },
   "command": {
     "type": "sequential",

diff --git a/src/main/deploy/pathplanner/autos/RL Path.auto b/src/main/deploy/pathplanner/autos/RL Path.auto
diff --git a/...in/deploy/pathplanner/paths/bl2 Path.path → ...in/deploy/pathplanner/paths/BLS Path.path b/...in/deploy/pathplanner/paths/bl2 Path.path → ...in/deploy/pathplanner/paths/BLS Path.path
@@ -3,56 +3,61 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 1.52342385444866,
-        "y": 7.390316728376925
+        "x": 0.4234789096358818,
+        "y": 6.981410202136645
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.5081494343531894,
-        "y": 7.0783244654413116
+        "x": 0.48197745893701854,
+        "y": 7.000909718570356
       },
       "isLocked": false,
       "linkedName": null
     },
     {
       "anchor": {
-        "x": 2.4106518521846283,
-        "y": 6.337342840960248
+        "x": 2.855863033663389,
+        "y": 7.659671159798161
       },
       "prevControl": {
-        "x": 2.4301513686183416,
-        "y": 6.3470925991771034
+        "x": 2.8753625500971016,
+        "y": 7.679170676231872
       },
       "nextControl": {
-        "x": 2.391152335750915,
-        "y": 6.327593082743392
+        "x": 2.8363635172296764,
+        "y": 7.640171643364449
       },
       "isLocked": false,
       "linkedName": null
     },
     {
       "anchor": {
-        "x": 3.5026247724725117,
-        "y": 6.337342840960248
+        "x": 5.311635466575775,
+        "y": 7.659671159798161
       },
       "prevControl": {
-        "x": 2.4106518521846274,
-        "y": 6.3470925991771034
+        "x": 4.507280413685147,
+        "y": 7.625547006039165
       },
       "nextControl": null,
       "isLocked": false,
       "linkedName": null
     }
   ],
-  "rotationTargets": [
+  "rotationTargets": [],
+  "constraintZones": [],
+  "eventMarkers": [
     {
-      "waypointRelativePos": 0.95,
-      "rotationDegrees": -90.60054724312275,
-      "rotateFast": false
+      "name": "shoot",
+      "waypointRelativePos": 0,
+      "command": {
+        "type": "parallel",
+        "data": {
+          "commands": []
+        }
+      }
     }
   ],
-  "constraintZones": [],
-  "eventMarkers": [],
   "globalConstraints": {
     "maxVelocity": 3.0,
     "maxAcceleration": 3.0,