changes to autos

team581 · Nov 15, 2023 · 1f18098 · 1f18098
1 parent 9b7281d
commit 1f18098
Show file tree

Hide file tree

Showing 13 changed files with 393 additions and 168 deletions.
diff --git a/src/main/deploy/pathplanner/BlueBump2.path b/src/main/deploy/pathplanner/BlueBump2.path
@@ -10,7 +10,7 @@
         "x": 2.9248226748842034,
         "y": 0.707445764015732
       },
-      "holonomicAngle": 180.0,
+      "holonomicAngle": 0.0,
       "isReversal": false,
       "velOverride": null,
       "isLocked": false,
@@ -19,13 +19,39 @@
         "names": [
           "home",
           "preload",
-          "scoreLow"
+          "scoreHigh",
+          "stow"
         ],
         "executionBehavior": "sequential",
         "waitBehavior": "none",
         "waitTime": 0
       }
     },
+    {
+      "anchorPoint": {
+        "x": 4.553732702329884,
+        "y": 0.7547402256002796
+      },
+      "prevControl": {
+        "x": 4.00655431668968,
+        "y": 0.7547402256002796
+      },
+      "nextControl": {
+        "x": 5.698764143187168,
+        "y": 0.7547402256002796
+      },
+      "holonomicAngle": 0,
+      "isReversal": false,
+      "velOverride": null,
+      "isLocked": false,
+      "isStopPoint": false,
+      "stopEvent": {
+        "names": [],
+        "executionBehavior": "parallel",
+        "waitBehavior": "none",
+        "waitTime": 0
+      }
+    },
     {
       "anchorPoint": {
         "x": 7.084232792072272,
@@ -45,7 +71,9 @@
       "isLocked": false,
       "isStopPoint": true,
       "stopEvent": {
-        "names": [],
+        "names": [
+          "intake"
+        ],
         "executionBehavior": "sequential",
         "waitBehavior": "none",
         "waitTime": 0
@@ -78,15 +106,15 @@
   ],
   "markers": [
     {
-      "position": 0.6482954545454549,
+      "position": 2.180397727272727,
       "names": [
-        "intakeCube"
+        "stow"
       ]
     },
     {
-      "position": 1.180397727272727,
+      "position": 1.461818181818112,
       "names": [
-        "stow"
+        "intakeCube"
       ]
     }
   ]

diff --git a/src/main/deploy/pathplanner/BlueBump3.path b/src/main/deploy/pathplanner/BlueBump3.path
@@ -7,10 +7,10 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.5561411144717194,
-        "y": 0.8222286896405007
+        "x": 2.5636022660440645,
+        "y": 0.9234490801784156
       },
-      "holonomicAngle": 180.0,
+      "holonomicAngle": 0.0,
       "isReversal": false,
       "velOverride": null,
       "isLocked": false,
@@ -19,13 +19,39 @@
         "names": [
           "home",
           "preload",
-          "scoreLow"
+          "scoreHigh",
+          "stow"
         ],
         "executionBehavior": "sequential",
         "waitBehavior": "none",
         "waitTime": 0
       }
     },
+    {
+      "anchorPoint": {
+        "x": 2.952768587420199,
+        "y": 0.9262720950548883
+      },
+      "prevControl": {
+        "x": 2.549424522428349,
+        "y": 0.9262720950548883
+      },
+      "nextControl": {
+        "x": 3.3561126524120537,
+        "y": 0.9262720950548883
+      },
+      "holonomicAngle": 180.0,
+      "isReversal": false,
+      "velOverride": null,
+      "isLocked": false,
+      "isStopPoint": false,
+      "stopEvent": {
+        "names": [],
+        "executionBehavior": "parallel",
+        "waitBehavior": "none",
+        "waitTime": 0
+      }
+    },
     {
       "anchorPoint": {
         "x": 7.084232792072272,
@@ -45,7 +71,9 @@
       "isLocked": false,
       "isStopPoint": true,
       "stopEvent": {
-        "names": [],
+        "names": [
+          "intake"
+        ],
         "executionBehavior": "sequential",
         "waitBehavior": "none",
         "waitTime": 0
@@ -80,16 +108,16 @@
     },
     {
       "anchorPoint": {
-        "x": 5.137659971279337,
-        "y": 0.8471099580535155
+        "x": 5.171247432366477,
+        "y": 0.8805302632003253
       },
       "prevControl": {
-        "x": 2.9543595016493014,
-        "y": 0.8471099580535155
+        "x": 2.9880787766931345,
+        "y": 0.8565393988522682
       },
       "nextControl": {
-        "x": 6.317415584492585,
-        "y": 0.8471099580535155
+        "x": 6.211874107057772,
+        "y": 0.8919657211639652
       },
       "holonomicAngle": 180.0,
       "isReversal": false,
@@ -107,49 +135,26 @@
     },
     {
       "anchorPoint": {
-        "x": 5.966520341679218,
-        "y": 2.2581620919611276
-      },
-      "prevControl": {
-        "x": 5.587750523954341,
-        "y": 2.2581620919611276
-      },
-      "nextControl": {
-        "x": 6.530263077308415,
-        "y": 2.2581620919611276
-      },
-      "holonomicAngle": 180.0,
-      "isReversal": false,
-      "velOverride": null,
-      "isLocked": false,
-      "isStopPoint": false,
-      "stopEvent": {
-        "names": [],
-        "executionBehavior": "parallel",
-        "waitBehavior": "none",
-        "waitTime": 0
-      }
-    },
-    {
-      "anchorPoint": {
-        "x": 7.0535176390814565,
-        "y": 2.279802313386474
+        "x": 7.252500781749067,
+        "y": 2.184172471055355
       },
       "prevControl": {
-        "x": 6.279370735426079,
-        "y": 2.279802313386474
+        "x": 6.646421509676115,
+        "y": 1.3493840397095893
       },
       "nextControl": {
-        "x": 6.279370735426079,
-        "y": 2.279802313386474
+        "x": 6.646421509676115,
+        "y": 1.3493840397095893
       },
-      "holonomicAngle": 180.0,
+      "holonomicAngle": -135.0,
       "isReversal": true,
       "velOverride": null,
       "isLocked": false,
       "isStopPoint": true,
       "stopEvent": {
-        "names": [],
+        "names": [
+          "intake"
+        ],
         "executionBehavior": "sequential",
         "waitBehavior": "none",
         "waitTime": 0
@@ -161,12 +166,12 @@
         "y": 0.9518705691471896
       },
       "prevControl": {
-        "x": 6.105536326319467,
-        "y": 0.7280388779527571
+        "x": 5.777326704432687,
+        "y": 1.0177557587707124
       },
       "nextControl": {
-        "x": 3.157000450684807,
-        "y": 1.5189547755161845
+        "x": 3.10056940291484,
+        "y": 0.6693828681452603
       },
       "holonomicAngle": -179.84827369590738,
       "isReversal": false,
@@ -207,25 +212,25 @@
   ],
   "markers": [
     {
-      "position": 0.6482954545454549,
+      "position": 2.180397727272727,
       "names": [
-        "intakeCube"
+        "stow"
       ]
     },
     {
-      "position": 1.180397727272727,
+      "position": 5.426491477272728,
       "names": [
         "stow"
       ]
     },
     {
-      "position": 5.426491477272728,
+      "position": 4.094637784090915,
       "names": [
-        "stow"
+        "intakeCube"
       ]
     },
     {
-      "position": 3.0946377840909154,
+      "position": 1.8036363636362602,
       "names": [
         "intakeCube"
       ]

diff --git a/src/main/deploy/pathplanner/BlueFlat2.path b/src/main/deploy/pathplanner/BlueFlat2.path
@@ -10,7 +10,7 @@
         "x": 2.33799056266904,
         "y": 4.53447404705319
       },
-      "holonomicAngle": 180.0,
+      "holonomicAngle": 0.0,
       "isReversal": false,
       "velOverride": null,
       "isLocked": false,
@@ -19,7 +19,8 @@
         "names": [
           "home",
           "preload",
-          "scoreMid"
+          "scoreHigh",
+          "stow"
         ],
         "executionBehavior": "sequential",
         "waitBehavior": "none",
@@ -28,16 +29,41 @@
     },
     {
       "anchorPoint": {
-        "x": 6.844744350814339,
-        "y": 4.588474876093861
+        "x": 4.885360983275461,
+        "y": 4.53
       },
       "prevControl": {
-        "x": 6.377112164852355,
-        "y": 4.588474876093861
+        "x": 4.596970165887906,
+        "y": 4.53
       },
       "nextControl": {
-        "x": 6.377112164852355,
-        "y": 4.588474876093861
+        "x": 5.173751800663019,
+        "y": 4.53
+      },
+      "holonomicAngle": 180.0,
+      "isReversal": false,
+      "velOverride": null,
+      "isLocked": false,
+      "isStopPoint": false,
+      "stopEvent": {
+        "names": [],
+        "executionBehavior": "parallel",
+        "waitBehavior": "none",
+        "waitTime": 0
+      }
+    },
+    {
+      "anchorPoint": {
+        "x": 6.93230795876713,
+        "y": 4.597054101383524
+      },
+      "prevControl": {
+        "x": 6.464675772805147,
+        "y": 4.597054101383524
+      },
+      "nextControl": {
+        "x": 6.464675772805147,
+        "y": 4.597054101383524
       },
       "holonomicAngle": 180.0,
       "isReversal": true,
@@ -69,24 +95,26 @@
       "isLocked": false,
       "isStopPoint": false,
       "stopEvent": {
-        "names": [],
-        "executionBehavior": "parallel",
+        "names": [
+          "scoreLow"
+        ],
+        "executionBehavior": "sequential",
         "waitBehavior": "none",
         "waitTime": 0
       }
     }
   ],
   "markers": [
     {
-      "position": 0.0,
+      "position": 2.439999999999932,
       "names": [
-        "event"
+        "stow"
       ]
     },
     {
-      "position": 0.0,
+      "position": 1.461818181818124,
       "names": [
-        "event"
+        "intakeCube"
       ]
     }
   ]