Merge branch 'gpr' of https://github.com/StuyPulse/Aunt-Mary into gpr

Author: SP-COMPuter

simgui.json

@@ -74,6 +74,9 @@
           },
           "open": true
         },
+        "Arm": {
+          "open": true
+        },
         "Enabled Subsystems": {
           "open": true
         },

src/main/deploy/pathplanner/paths/Blue A BackOut.path

@@ -16,12 +16,12 @@
     },
     {
       "anchor": {
-        "x": 1.7667624337332588,
-        "y": 7.155919102260044
+        "x": 1.8559243338448659,
+        "y": 7.084099905831473
       },
       "prevControl": {
-        "x": 2.7086045351273205,
-        "y": 5.2971078945784
+        "x": 2.7977664352389278,
+        "y": 5.225288698149829
       },
       "nextControl": null,
       "isLocked": false,

src/main/deploy/pathplanner/paths/Blue B BackOut.path

@@ -16,12 +16,12 @@
     },
     {
       "anchor": {
-        "x": 1.7913482666015625,
-        "y": 0.9482513427734375
+        "x": 1.8468959263392855,
+        "y": 0.9474352155412942
       },
       "prevControl": {
-        "x": 2.1134625552413864,
-        "y": 1.5918435481692934
+        "x": 2.1690102149791093,
+        "y": 1.59102742093715
       },
       "nextControl": null,
       "isLocked": false,

src/main/deploy/pathplanner/paths/Blue C to HP.path

@@ -8,20 +8,20 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.677412418798617,
-        "y": 0.8471545847260358
+        "x": 1.7753160031297788,
+        "y": 0.8628603794216017
       },
       "isLocked": false,
       "linkedName": "Blue C"
     },
     {
       "anchor": {
-        "x": 1.7913482666015625,
-        "y": 0.9482513427734375
+        "x": 1.8468959263392855,
+        "y": 0.9474352155412942
       },
       "prevControl": {
-        "x": 3.788332020846281,
-        "y": 2.889014908288104
+        "x": 3.792473898733687,
+        "y": 2.9110708582078093
       },
       "nextControl": null,
       "isLocked": false,

src/main/deploy/pathplanner/paths/Blue D to HP.path

@@ -8,20 +8,20 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.8225941623865167,
-        "y": 0.9652696810756025
+        "x": 1.8314644800538167,
+        "y": 0.9271726670377329
       },
       "isLocked": false,
       "linkedName": "Blue D"
     },
     {
       "anchor": {
-        "x": 1.7913482666015625,
-        "y": 0.9482513427734375
+        "x": 1.8468959263392855,
+        "y": 0.9474352155412942
       },
       "prevControl": {
-        "x": 4.002363647577118,
-        "y": 2.672353652686721
+        "x": 4.030034028863112,
+        "y": 2.6743030082554684
       },
       "nextControl": null,
       "isLocked": false,

src/main/deploy/pathplanner/paths/Blue E BackOut.path

@@ -8,24 +8,24 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 3.5515891985159262,
-        "y": 1.8232282403035476
+        "x": 5.386913170083801,
+        "y": 2.49577535686917
       },
       "isLocked": false,
       "linkedName": "Blue E"
     },
     {
       "anchor": {
-        "x": 1.7913482666015625,
-        "y": 0.9482513427734375
+        "x": 5.554459926060267,
+        "y": 2.2909336635044646
       },
       "prevControl": {
-        "x": 3.307947704033354,
-        "y": 1.8863932764466296
+        "x": 5.395562764447221,
+        "y": 2.483940637552859
       },
       "nextControl": null,
       "isLocked": false,
-      "linkedName": "Blue Bottom HP"
+      "linkedName": "Blue E BackOut"
     }
   ],
   "rotationTargets": [],
@@ -42,7 +42,7 @@
   },
   "goalEndState": {
     "velocity": 0,
-    "rotation": 55.0
+    "rotation": 119.99999999999999
   },
   "reversed": false,
   "folder": "Blue To Reef",

src/main/deploy/pathplanner/paths/Blue F to HP.path

@@ -8,20 +8,20 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 3.0690825922922467,
-        "y": 1.4826731027701139
+        "x": 3.1204018997564584,
+        "y": 1.526923207247039
       },
       "isLocked": false,
       "linkedName": "Blue F"
     },
     {
       "anchor": {
-        "x": 1.7913482666015625,
-        "y": 0.9482513427734375
+        "x": 1.8468959263392855,
+        "y": 0.9474352155412942
       },
       "prevControl": {
-        "x": 4.392638728135962,
-        "y": 2.5643336949054336
+        "x": 4.367773530294288,
+        "y": 2.5077784351926717
       },
       "nextControl": null,
       "isLocked": false,

src/main/deploy/pathplanner/paths/Blue HP to A.path

@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 1.7667624337332588,
-        "y": 7.155919102260044
+        "x": 1.8559243338448659,
+        "y": 7.084099905831473
       },
       "prevControl": null,
       "nextControl": {
-        "x": 3.1529943518522874,
-        "y": 4.021410642438601
+        "x": 3.2421562519638947,
+        "y": 3.9495914460100305
       },
       "isLocked": false,
       "linkedName": "Blue Top HP"

src/main/deploy/pathplanner/paths/Blue HP to B.path

@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 1.7913482666015625,
-        "y": 0.9482513427734375
+        "x": 1.8468959263392855,
+        "y": 0.9474352155412942
       },
       "prevControl": null,
       "nextControl": {
-        "x": 3.3143676959420842,
-        "y": 4.054023214796178
+        "x": 3.369915355679807,
+        "y": 4.053207087564035
       },
       "isLocked": false,
       "linkedName": "Blue Bottom HP"

src/main/deploy/pathplanner/paths/Blue HP to C.path

@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 1.7913482666015625,
-        "y": 0.9482513427734375
+        "x": 1.8468959263392855,
+        "y": 0.9474352155412942
       },
       "prevControl": null,
       "nextControl": {
-        "x": 3.887690042299406,
-        "y": 2.981845960209278
+        "x": 3.9432377020371288,
+        "y": 2.9810298329771348
       },
       "isLocked": false,
       "linkedName": "Blue Bottom HP"