Commit end state of 7 rivers regional

frc1675 · Apr 8, 2024 · 04aa719 · 04aa719
1 parent 4940008
commit 04aa719
Show file tree

Hide file tree

Showing 15 changed files with 256 additions and 58 deletions.
diff --git a/...ploy/pathplanner/autos/SubA-CloseABC.auto → ...pathplanner/autos/SubA-CloseABC-MidC.auto b/...ploy/pathplanner/autos/SubA-CloseABC.auto → ...pathplanner/autos/SubA-CloseABC-MidC.auto
@@ -105,9 +105,28 @@
           }
         },
         {
-          "type": "named",
+          "type": "deadline",
           "data": {
-            "name": "armHome"
+            "commands": [
+              {
+                "type": "path",
+                "data": {
+                  "pathName": "CloseCToMidC"
+                }
+              },
+              {
+                "type": "named",
+                "data": {
+                  "name": "intake"
+                }
+              },
+              {
+                "type": "named",
+                "data": {
+                  "name": "armHome"
+                }
+              }
+            ]
           }
         }
       ]

diff --git a/src/main/deploy/pathplanner/autos/SubB-CloseABC.auto b/src/main/deploy/pathplanner/autos/SubB-CloseABC.auto
@@ -103,12 +103,6 @@
           "data": {
             "name": "closeCShot"
           }
-        },
-        {
-          "type": "named",
-          "data": {
-            "name": "armHome"
-          }
         }
       ]
     }

diff --git a/...ploy/pathplanner/autos/SubB-CloseCBA.auto → ...pathplanner/autos/SubB-CloseCBA-MidC.auto b/...ploy/pathplanner/autos/SubB-CloseCBA.auto → ...pathplanner/autos/SubB-CloseCBA-MidC.auto
@@ -105,9 +105,28 @@
           }
         },
         {
-          "type": "named",
+          "type": "deadline",
           "data": {
-            "name": "armHome"
+            "commands": [
+              {
+                "type": "path",
+                "data": {
+                  "pathName": "CloseAToMidC"
+                }
+              },
+              {
+                "type": "named",
+                "data": {
+                  "name": "intake"
+                }
+              },
+              {
+                "type": "named",
+                "data": {
+                  "name": "armHome"
+                }
+              }
+            ]
           }
         }
       ]

diff --git a/src/main/deploy/pathplanner/paths/BehindCloseBToMidC.path b/src/main/deploy/pathplanner/paths/BehindCloseBToMidC.path
@@ -16,12 +16,12 @@
     },
     {
       "anchor": {
-        "x": 8.224361665149523,
-        "y": 4.095469234223708
+        "x": 8.504473271428711,
+        "y": 4.133925300660873
       },
       "prevControl": {
-        "x": 6.949607715514939,
-        "y": 4.099949654190251
+        "x": 7.229719321794128,
+        "y": 4.138405720627416
       },
       "nextControl": null,
       "isLocked": false,

diff --git a/src/main/deploy/pathplanner/paths/CloseAToMidC.path b/src/main/deploy/pathplanner/paths/CloseAToMidC.path
@@ -0,0 +1,68 @@
+{
+  "version": 1.0,
+  "waypoints": [
+    {
+      "anchor": {
+        "x": 2.8913771479041297,
+        "y": 6.996025357200549
+      },
+      "prevControl": null,
+      "nextControl": {
+        "x": 3.89137714790413,
+        "y": 6.996025357200549
+      },
+      "isLocked": false,
+      "linkedName": "CloseAScoreAngle"
+    },
+    {
+      "anchor": {
+        "x": 5.155174019335199,
+        "y": 4.27445533921025
+      },
+      "prevControl": {
+        "x": 4.306533672637192,
+        "y": 4.894609842560322
+      },
+      "nextControl": {
+        "x": 6.003814366033206,
+        "y": 3.6543008358601776
+      },
+      "isLocked": false,
+      "linkedName": null
+    },
+    {
+      "anchor": {
+        "x": 8.504473271428711,
+        "y": 4.133925300660873
+      },
+      "prevControl": {
+        "x": 7.586575764157559,
+        "y": 4.693842780096275
+      },
+      "nextControl": null,
+      "isLocked": false,
+      "linkedName": "MidC"
+    }
+  ],
+  "rotationTargets": [],
+  "constraintZones": [],
+  "eventMarkers": [],
+  "globalConstraints": {
+    "maxVelocity": 3.0,
+    "maxAcceleration": 3.0,
+    "maxAngularVelocity": 540.0,
+    "maxAngularAcceleration": 720.0
+  },
+  "goalEndState": {
+    "velocity": 0,
+    "rotation": -13.349248913915638,
+    "rotateFast": false
+  },
+  "reversed": false,
+  "folder": null,
+  "previewStartingState": {
+    "rotation": 0,
+    "velocity": 0
+  },
+  "useDefaultConstraints": true
+}
diff --git a/src/main/deploy/pathplanner/paths/CloseBToMidC.path b/src/main/deploy/pathplanner/paths/CloseBToMidC.path
@@ -16,12 +16,12 @@
     },
     {
       "anchor": {
-        "x": 8.224361665149523,
-        "y": 4.095469234223708
+        "x": 8.504473271428711,
+        "y": 4.133925300660873
       },
       "prevControl": {
-        "x": 6.532996166817632,
-        "y": 4.134098141788391
+        "x": 6.813107773096821,
+        "y": 4.172554208225556
       },
       "nextControl": null,
       "isLocked": false,

diff --git a/src/main/deploy/pathplanner/paths/CloseCToMidC.path b/src/main/deploy/pathplanner/paths/CloseCToMidC.path
@@ -0,0 +1,68 @@
+{
+  "version": 1.0,
+  "waypoints": [
+    {
+      "anchor": {
+        "x": 2.649054998537956,
+        "y": 4.251033666118688
+      },
+      "prevControl": null,
+      "nextControl": {
+        "x": 3.0472234410945274,
+        "y": 5.550936522700434
+      },
+      "isLocked": false,
+      "linkedName": null
+    },
+    {
+      "anchor": {
+        "x": 4.206596259126896,
+        "y": 4.883418839590889
+      },
+      "prevControl": {
+        "x": 3.457102720196879,
+        "y": 5.117635570506519
+      },
+      "nextControl": {
+        "x": 5.360354404775862,
+        "y": 4.522869419075588
+      },
+      "isLocked": false,
+      "linkedName": null
+    },
+    {
+      "anchor": {
+        "x": 8.258307055187618,
+        "y": 4.098673466633687
+      },
+      "prevControl": {
+        "x": 6.1271734526350645,
+        "y": 3.841154387016335
+      },
+      "nextControl": null,
+      "isLocked": false,
+      "linkedName": null
+    }
+  ],
+  "rotationTargets": [],
+  "constraintZones": [],
+  "eventMarkers": [],
+  "globalConstraints": {
+    "maxVelocity": 3.0,
+    "maxAcceleration": 3.0,
+    "maxAngularVelocity": 540.0,
+    "maxAngularAcceleration": 720.0
+  },
+  "goalEndState": {
+    "velocity": 0,
+    "rotation": 0.34886181782115616,
+    "rotateFast": false
+  },
+  "reversed": false,
+  "folder": null,
+  "previewStartingState": {
+    "rotation": -30.55000000000001,
+    "velocity": 0
+  },
+  "useDefaultConstraints": true
+}
diff --git a/src/main/deploy/pathplanner/paths/CloseCToMidD.path b/src/main/deploy/pathplanner/paths/CloseCToMidD.path
@@ -8,43 +8,49 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.2977299021645106,
-        "y": 2.8340224440791246
+        "x": 2.7310308543584263,
+        "y": 5.246454772510115
       },
       "isLocked": false,
-      "linkedName": "CloseCScoreAngle"
+      "linkedName": null
     },
     {
       "anchor": {
-        "x": 3.3985485374679727,
-        "y": 2.0611072320575454
+        "x": 4.604764701683467,
+        "y": 4.719467127949948
       },
       "prevControl": {
-        "x": 2.625633325446393,
-        "y": 2.2719022898816124
+        "x": 4.156117019553612,
+        "y": 5.018565582703185
       },
       "nextControl": {
-        "x": 4.469972178941018,
-        "y": 1.7689007843830789
+        "x": 5.131752346243635,
+        "y": 4.368142031576503
       },
       "isLocked": false,
       "linkedName": null
     },
     {
       "anchor": {
-        "x": 8.118015665417921,
-        "y": 2.41243232843099
+        "x": 8.224361665149523,
+        "y": 4.095469234223708
       },
       "prevControl": {
-        "x": 6.642801001178277,
-        "y": 0.9440473617109728
+        "x": 7.56760634776619,
+        "y": 3.5366726368260153
       },
       "nextControl": null,
       "isLocked": false,
-      "linkedName": "MidD"
+      "linkedName": null
+    }
+  ],
+  "rotationTargets": [
+    {
+      "waypointRelativePos": 1.55,
+      "rotationDegrees": 10.0,
+      "rotateFast": false
     }
   ],
-  "rotationTargets": [],
   "constraintZones": [],
   "eventMarkers": [],
   "globalConstraints": {

diff --git a/src/main/deploy/pathplanner/paths/MidCToBehindCloseB.path b/src/main/deploy/pathplanner/paths/MidCToBehindCloseB.path
@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 8.224361665149523,
-        "y": 4.095469234223708
+        "x": 8.504473271428711,
+        "y": 4.133925300660873
       },
       "prevControl": null,
       "nextControl": {
-        "x": 7.067810805987872,
-        "y": 3.948605633060323
+        "x": 7.34792241226706,
+        "y": 3.987061699497488
       },
       "isLocked": false,
       "linkedName": "MidC"

diff --git a/src/main/deploy/pathplanner/paths/MidCToSourceSideScore.path b/src/main/deploy/pathplanner/paths/MidCToSourceSideScore.path
@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 8.224361665149523,
-        "y": 4.095469234223708
+        "x": 8.504473271428711,
+        "y": 4.133925300660873
       },
       "prevControl": null,
       "nextControl": {
-        "x": 6.020768852845534,
-        "y": 4.113609049229508
+        "x": 6.3008804591247225,
+        "y": 4.152065115666673
       },
       "isLocked": false,
       "linkedName": "MidC"

diff --git a/src/main/deploy/pathplanner/paths/SourceSideScoreToMidC.path b/src/main/deploy/pathplanner/paths/SourceSideScoreToMidC.path
@@ -16,19 +16,25 @@
     },
     {
       "anchor": {
-        "x": 8.224361665149523,
-        "y": 4.095469234223708
+        "x": 8.504473271428711,
+        "y": 4.133925300660873
       },
       "prevControl": {
-        "x": 6.239319173473628,
-        "y": 4.127268444268764
+        "x": 6.519430779752817,
+        "y": 4.165724510705929
       },
       "nextControl": null,
       "isLocked": false,
       "linkedName": "MidC"
     }
   ],
-  "rotationTargets": [],
+  "rotationTargets": [
+    {
+      "waypointRelativePos": 0.75,
+      "rotationDegrees": 0,
+      "rotateFast": false
+    }
+  ],
   "constraintZones": [],
   "eventMarkers": [],
   "globalConstraints": {

diff --git a/src/main/deploy/pathplanner/paths/SubCToMidC.path b/src/main/deploy/pathplanner/paths/SubCToMidC.path
@@ -48,12 +48,12 @@
     },
     {
       "anchor": {
-        "x": 8.224361665149523,
-        "y": 4.095469234223708
+        "x": 8.504473271428711,
+        "y": 4.133925300660873
       },
       "prevControl": {
-        "x": 7.618549310350564,
-        "y": 3.994500508423881
+        "x": 7.898660916629752,
+        "y": 4.032956574861046
       },
       "nextControl": null,
       "isLocked": false,