Merge branch 'main' into #95

Patribots4738 · Mar 17, 2023 · 05b3e4c · 05b3e4c
2 parents 4068ce4 + a306bb1
commit 05b3e4c
Show file tree

Hide file tree

Showing 93 changed files with 225 additions and 219 deletions.
diff --git a/.pathplanner/settings.json b/.pathplanner/settings.json
@@ -1,6 +1,6 @@
 {
-  "robotWidth": 0.8382,
-  "robotLength": 0.8382,
+  "robotWidth": 0.79248,
+  "robotLength": 0.79248,
   "holonomicMode": true,
   "generateJSON": true,
   "generateCSV": false

diff --git a/src/main/deploy/pathplanner/Over Chargepad theory.path b/src/main/deploy/pathplanner/Over Chargepad theory.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.6928156933236946,
+        "x": 1.76874,
         "y": 3.3115587598696563
       },
       "prevControl": null,
       "nextControl": {
-        "x": 3.2115650556087436,
+        "x": 3.287489362285049,
         "y": 3.7226488128189934
       },
       "holonomicAngle": 178.6980473274211,
@@ -49,15 +49,15 @@
     },
     {
       "anchorPoint": {
-        "x": 1.6824291095390713,
+        "x": 1.75874,
         "y": 2.728938223833895
       },
       "prevControl": {
-        "x": 1.2634180536627295,
+        "x": 1.3397289441236582,
         "y": 2.577628675878549
       },
       "nextControl": {
-        "x": 2.9156992683870833,
+        "x": 2.9920101588480117,
         "y": 3.174285781195677
       },
       "holonomicAngle": 179.49741833327897,

diff --git a/src/main/deploy/pathplanner/_1_A.path b/src/main/deploy/pathplanner/_1_A.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.703410612293437,
+        "x": 1.77874,
         "y": 0.49835628662367387
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.703410612293438,
+        "x": 2.778740000000001,
         "y": 0.49835628662367387
       },
       "holonomicAngle": 180.0,
@@ -24,11 +24,11 @@
     },
     {
       "anchorPoint": {
-        "x": 6.55,
+        "x": 6.5,
         "y": 0.92
       },
       "prevControl": {
-        "x": 5.55,
+        "x": 5.5,
         "y": 0.92
       },
       "nextControl": null,

diff --git a/src/main/deploy/pathplanner/_1_B.path b/src/main/deploy/pathplanner/_1_B.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.7,
+        "x": 1.77874,
         "y": 0.5
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.656693051805723,
+        "x": 2.735433051805723,
         "y": 0.46961717901637434
       },
       "holonomicAngle": 180.0,
@@ -24,12 +24,12 @@
     },
     {
       "anchorPoint": {
-        "x": 6.73,
-        "y": 1.7899999999999998
+        "x": 6.665801109570119,
+        "y": 1.7418622814878797
       },
       "prevControl": {
-        "x": 5.791114688496408,
-        "y": 0.4040892005489741
+        "x": 5.482108925724973,
+        "y": 0.558170097642734
       },
       "nextControl": null,
       "holonomicAngle": 45.0,

diff --git a/src/main/deploy/pathplanner/_1_CH.path b/src/main/deploy/pathplanner/_1_CH.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.6956512863271764,
+        "x": 1.77874,
         "y": 0.5218689715673578
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.138781489154012,
+        "x": 2.2218702028268353,
         "y": 0.6258689171287583
       },
       "holonomicAngle": 180.0,

diff --git a/src/main/deploy/pathplanner/_2_A.path b/src/main/deploy/pathplanner/_2_A.path
@@ -2,13 +2,13 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.6820860760365588,
-        "y": 1.055433909664977
+        "x": 1.77874,
+        "y": 1.06
       },
       "prevControl": null,
       "nextControl": {
-        "x": 5.452553466414836,
-        "y": 0.6115944656957432
+        "x": 5.549207390378276,
+        "y": 0.6161605560307662
       },
       "holonomicAngle": 180.0,
       "isReversal": false,
@@ -24,11 +24,11 @@
     },
     {
       "anchorPoint": {
-        "x": 6.55,
+        "x": 6.5,
         "y": 0.94
       },
       "prevControl": {
-        "x": 5.55,
+        "x": 5.5,
         "y": 0.94
       },
       "nextControl": null,

diff --git a/src/main/deploy/pathplanner/_2_B.path b/src/main/deploy/pathplanner/_2_B.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.7,
+        "x": 1.77874,
         "y": 1.06
       },
       "prevControl": null,
       "nextControl": {
-        "x": 4.000808558461665,
+        "x": 4.079548558461664,
         "y": 0.5254097747174611
       },
       "holonomicAngle": 180.0,
@@ -24,12 +24,12 @@
     },
     {
       "anchorPoint": {
-        "x": 6.73,
-        "y": 1.79
+        "x": 6.67,
+        "y": 1.74
       },
       "prevControl": {
-        "x": 6.178706742564297,
-        "y": 0.7364836075379808
+        "x": 6.118706742564297,
+        "y": 0.6864836075379808
       },
       "nextControl": null,
       "holonomicAngle": 45.0,

diff --git a/src/main/deploy/pathplanner/_2_CH.path b/src/main/deploy/pathplanner/_2_CH.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.71,
+        "x": 1.77874,
         "y": 1.075
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.71,
+        "x": 1.77874,
         "y": 1.5533238396254438
       },
       "holonomicAngle": 180.0,

diff --git a/src/main/deploy/pathplanner/_3_A.path b/src/main/deploy/pathplanner/_3_A.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.6956512863271764,
+        "x": 1.77874,
         "y": 1.6342162153979862
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.048346753883229,
+        "x": 2.1314354675560527,
         "y": 0.5896950230204459
       },
       "holonomicAngle": 180.0,
@@ -24,11 +24,11 @@
     },
     {
       "anchorPoint": {
-        "x": 6.55,
+        "x": 6.5,
         "y": 0.9152600699952629
       },
       "prevControl": {
-        "x": 5.55,
+        "x": 5.5,
         "y": 0.9152600699952629
       },
       "nextControl": null,

diff --git a/src/main/deploy/pathplanner/_3_B.path b/src/main/deploy/pathplanner/_3_B.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.7,
+        "x": 1.77874,
         "y": 1.63
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.4177548123077686,
+        "x": 2.496494812307769,
         "y": 0.6693237516405423
       },
       "holonomicAngle": 180.0,
@@ -24,12 +24,12 @@
     },
     {
       "anchorPoint": {
-        "x": 6.73,
-        "y": 1.79
+        "x": 6.67,
+        "y": 1.74
       },
       "prevControl": {
-        "x": 5.727776281538643,
-        "y": 0.44865565369181826
+        "x": 5.667776281538642,
+        "y": 0.3986556536918182
       },
       "nextControl": null,
       "holonomicAngle": 45.0,

diff --git a/src/main/deploy/pathplanner/_3_CH.path b/src/main/deploy/pathplanner/_3_CH.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.7,
+        "x": 1.77874,
         "y": 1.6251727418709072
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.9735299586505202,
+        "x": 2.05226995865052,
         "y": 2.0823645832539865
       },
       "holonomicAngle": 180.0,

diff --git a/src/main/deploy/pathplanner/_4_B.path b/src/main/deploy/pathplanner/_4_B.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.7,
+        "x": 1.77874,
         "y": 2.19
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.494508933333412,
+        "x": 2.573248933333412,
         "y": 0.26636461625591495
       },
       "holonomicAngle": 180.0,
@@ -24,12 +24,12 @@
     },
     {
       "anchorPoint": {
-        "x": 6.73,
-        "y": 1.79
+        "x": 6.67,
+        "y": 1.74
       },
       "prevControl": {
-        "x": 5.094554783077083,
-        "y": 0.6981065470251588
+        "x": 5.034554783077082,
+        "y": 0.6481065470251588
       },
       "nextControl": null,
       "holonomicAngle": 45.0,

diff --git a/src/main/deploy/pathplanner/_4_CH.path b/src/main/deploy/pathplanner/_4_CH.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.7,
+        "x": 1.77874,
         "y": 2.19
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.0006190579746637,
+        "x": 2.0793590579746635,
         "y": 2.4697175263941613
       },
       "holonomicAngle": 180.0,

diff --git a/src/main/deploy/pathplanner/_4_M.path b/src/main/deploy/pathplanner/_4_M.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.7,
+        "x": 1.77874,
         "y": 2.19
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.932137922651527,
+        "x": 2.010877922651527,
         "y": 2.422137922651527
       },
       "holonomicAngle": 180.0,

diff --git a/src/main/deploy/pathplanner/_5_B.path b/src/main/deploy/pathplanner/_5_B.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.7,
+        "x": 1.77874,
         "y": 2.733103819702347
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.941775481235089,
+        "x": 2.0205154812350887,
         "y": 0.26636461625591495
       },
       "holonomicAngle": 180.0,
@@ -24,12 +24,12 @@
     },
     {
       "anchorPoint": {
-        "x": 6.73,
-        "y": 1.79
+        "x": 6.67,
+        "y": 1.74
       },
       "prevControl": {
-        "x": 5.4383750717387604,
-        "y": 0.5126823642459369
+        "x": 5.37837507173876,
+        "y": 0.4626823642459369
       },
       "nextControl": null,
       "holonomicAngle": 45.0,

diff --git a/src/main/deploy/pathplanner/_5_C.path b/src/main/deploy/pathplanner/_5_C.path
@@ -2,12 +2,12 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.7,
+        "x": 1.77874,
         "y": 2.73
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.5254881553846633,
+        "x": 1.6042281553846633,
         "y": 5.428079255230436
       },
       "holonomicAngle": 180.0,
@@ -24,12 +24,12 @@
     },
     {
       "anchorPoint": {
-        "x": 6.73,
-        "y": 3.71
+        "x": 6.6802465537310285,
+        "y": 3.7780555888978355
       },
       "prevControl": {
-        "x": 6.188301007692503,
-        "y": 4.881206142922727
+        "x": 6.138547561423531,
+        "y": 4.949261731820565
       },
       "nextControl": null,
       "holonomicAngle": -45.0,