Merge Conflicts

frc4911 · Apr 21, 2023 · 1572de3 · 1572de3
2 parents 9ca23cf + 5910f68
commit 1572de3
Show file tree

Hide file tree

Showing 30 changed files with 375 additions and 156 deletions.
diff --git a/src/main/deploy/pathplanner/AutoBalance.path b/src/main/deploy/pathplanner/AutoBalance.path
@@ -26,11 +26,11 @@
     },
     {
       "anchorPoint": {
-        "x": 4.30215262712979,
+        "x": 4.816748235493618,
         "y": 2.15
       },
       "prevControl": {
-        "x": 3.3021526271297903,
+        "x": 3.816748235493618,
         "y": 2.15
       },
       "nextControl": null,

diff --git a/src/main/deploy/pathplanner/AutoBalance2.path b/src/main/deploy/pathplanner/AutoBalance2.path
@@ -0,0 +1,79 @@
+{
+  "waypoints": [
+    {
+      "anchorPoint": {
+        "x": 1.8778355388379817,
+        "y": 2.149866097164433
+      },
+      "prevControl": null,
+      "nextControl": {
+        "x": 1.8778355388379817,
+        "y": 2.149866097164433
+      },
+      "holonomicAngle": 0.0,
+      "isReversal": false,
+      "velOverride": null,
+      "isLocked": false,
+      "isStopPoint": false,
+      "stopEvent": {
+        "names": [
+          "scoreConeOne",
+          "stowOne"
+        ],
+        "executionBehavior": "sequential",
+        "waitBehavior": "none",
+        "waitTime": 1.0
+      }
+    },
+    {
+      "anchorPoint": {
+        "x": 2.3809956892381683,
+        "y": 2.149866097164433
+      },
+      "prevControl": {
+        "x": 2.426737717083253,
+        "y": 2.149866097164433
+      },
+      "nextControl": {
+        "x": 2.2094637675193156,
+        "y": 2.149866097164433
+      },
+      "holonomicAngle": 180.0,
+      "isReversal": false,
+      "velOverride": null,
+      "isLocked": false,
+      "isStopPoint": false,
+      "stopEvent": {
+        "names": [],
+        "executionBehavior": "parallel",
+        "waitBehavior": "none",
+        "waitTime": 0
+      }
+    },
+    {
+      "anchorPoint": {
+        "x": 4.599474534184447,
+        "y": 2.1384306392007923
+      },
+      "prevControl": {
+        "x": 3.5994745341844467,
+        "y": 2.1384306392007923
+      },
+      "nextControl": null,
+      "holonomicAngle": 180.0,
+      "isReversal": false,
+      "velOverride": null,
+      "isLocked": false,
+      "isStopPoint": false,
+      "stopEvent": {
+        "names": [
+          "autoBalance"
+        ],
+        "executionBehavior": "parallel",
+        "waitBehavior": "none",
+        "waitTime": 0
+      }
+    }
+  ],
+  "markers": []
+}
diff --git a/src/main/deploy/pathplanner/Score2Guard.path b/src/main/deploy/pathplanner/Score2Guard.path
@@ -26,16 +26,16 @@
     },
     {
       "anchorPoint": {
-        "x": 3.5153670307340614,
-        "y": 0.804334942003217
+        "x": 3.6503315232022757,
+        "y": 0.9034011791276062
       },
       "prevControl": {
-        "x": 3.366199539103919,
-        "y": 0.804334942003217
+        "x": 3.545151398434038,
+        "y": 1.3340956971975744
       },
       "nextControl": {
-        "x": 3.5987291557929066,
-        "y": 0.804334942003217
+        "x": 3.6701082400159057,
+        "y": 0.8224189257235414
       },
       "holonomicAngle": 15.0,
       "isReversal": false,
@@ -51,16 +51,16 @@
     },
     {
       "anchorPoint": {
-        "x": 7.030734061468123,
-        "y": 0.7772415544831102
+        "x": 6.829388837094364,
+        "y": 0.8919657211639663
       },
       "prevControl": {
-        "x": 6.489648965983618,
-        "y": 0.7772246452719278
+        "x": 6.28830374160986,
+        "y": 0.891948811952784
       },
       "nextControl": {
-        "x": 6.489648965983618,
-        "y": 0.7772246452719278
+        "x": 6.28830374160986,
+        "y": 0.891948811952784
       },
       "holonomicAngle": 0,
       "isReversal": true,
@@ -76,16 +76,16 @@
     },
     {
       "anchorPoint": {
-        "x": 4.118194903056473,
-        "y": 0.804334942003217
+        "x": 4.027701636002416,
+        "y": 0.8119175154184826
       },
       "prevControl": {
-        "x": 4.315088535822521,
-        "y": 0.804334942003217
+        "x": 4.224595268768463,
+        "y": 0.8119175154184826
       },
       "nextControl": {
-        "x": 3.878720927546677,
-        "y": 0.804334942003217
+        "x": 3.7882276604926197,
+        "y": 0.8119175154184826
       },
       "holonomicAngle": 120.0,
       "isReversal": false,

diff --git a/src/main/deploy/pathplanner/Score2Substation.path b/src/main/deploy/pathplanner/Score2Substation.path
@@ -26,16 +26,16 @@
     },
     {
       "anchorPoint": {
-        "x": 6.732706798746932,
-        "y": 4.36
+        "x": 6.73790517338524,
+        "y": 4.425522231928914
       },
       "prevControl": {
-        "x": 6.482092964185928,
-        "y": 4.366773346880027
+        "x": 6.487291338824236,
+        "y": 4.432295578808941
       },
       "nextControl": {
-        "x": 6.482092964185928,
-        "y": 4.366773346880027
+        "x": 6.487291338824236,
+        "y": 4.432295578808941
       },
       "holonomicAngle": 0,
       "isReversal": true,
@@ -51,12 +51,12 @@
     },
     {
       "anchorPoint": {
-        "x": 1.63,
-        "y": 4.67
+        "x": 1.8778355388379817,
+        "y": 4.928682382329101
       },
       "prevControl": {
-        "x": 1.7316002032004065,
-        "y": 4.697093387520109
+        "x": 2.6100621193692985,
+        "y": 4.928682382329101
       },
       "nextControl": null,
       "holonomicAngle": 180.001,

diff --git a/src/main/deploy/pathplanner/Score2SubstationBalance.path b/src/main/deploy/pathplanner/Score2SubstationBalance.path
@@ -2,13 +2,13 @@
   "waypoints": [
     {
       "anchorPoint": {
-        "x": 1.82,
-        "y": 5.0
+        "x": 1.8778355388379817,
+        "y": 4.9972951301109445
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.8020491227072364,
-        "y": 5.0050349837765
+        "x": 1.859884661545218,
+        "y": 5.002330113887444
       },
       "holonomicAngle": 0.0,
       "isReversal": false,
@@ -26,16 +26,16 @@
     },
     {
       "anchorPoint": {
-        "x": 6.715034257457958,
-        "y": 4.231119446547024
+        "x": 6.760776089312521,
+        "y": 4.562747727492601
       },
       "prevControl": {
-        "x": 6.125588817986955,
-        "y": 4.5710926696033125
+        "x": 6.154696817239569,
+        "y": 4.585618643419882
       },
       "nextControl": {
-        "x": 6.125588817986955,
-        "y": 4.5710926696033125
+        "x": 6.154696817239569,
+        "y": 4.585618643419882
       },
       "holonomicAngle": 0,
       "isReversal": true,
@@ -51,16 +51,16 @@
     },
     {
       "anchorPoint": {
-        "x": 1.7291745853106537,
-        "y": 3.5221210528013063
+        "x": 1.8892709968016221,
+        "y": 3.5335565107649467
       },
       "prevControl": {
-        "x": 2.8819934103631555,
-        "y": 5.136067407874807
+        "x": 3.0420898218541232,
+        "y": 5.147502865838449
       },
       "nextControl": {
-        "x": 1.5576427158560446,
-        "y": 3.2819764355648537
+        "x": 1.717739127347013,
+        "y": 3.293411893528494
       },
       "holonomicAngle": 180.001,
       "isReversal": false,

diff --git a/src/main/deploy/pathplanner/Score3Guard.path b/src/main/deploy/pathplanner/Score3Guard.path
@@ -74,16 +74,16 @@
     },
     {
       "anchorPoint": {
-        "x": 6.285394970789942,
-        "y": 0.9330962661925316
+        "x": 4.5030016021570525,
+        "y": 0.9538573884840088
       },
       "prevControl": {
-        "x": 4.811785623571247,
-        "y": 0.9180594361188724
+        "x": 3.029392254938357,
+        "y": 0.9388205584103496
       },
       "nextControl": {
-        "x": 4.811785623571247,
-        "y": 0.9180594361188724
+        "x": 3.029392254938357,
+        "y": 0.9388205584103496
       },
       "holonomicAngle": 0,
       "isReversal": true,