Changes from Champs (#107)

* Adjust top ferry * Add lift min height reset * Add lift min height reset to shuffleboard * Move ferry min dist far side back 0.25 m * Set target height on min height reset * Fix led instruction interrupting intake * Decrease align tolerances hgf, make hg auto * Tune ferry auto * Increase ferry shot time * CBF auto * Adjust C pickup * CBAEF and M76 autons * Re zero swerve * Flip the bloody modules * Fix comments M76 * Fix ferry auto reroutes * Increase tolerance on some shots in CBAE autos * Remove math from absolute offsets * New HG auto * Tune ferry shot F intake path * Remove old autos from chooser * Match 120 auton * Move back ferrying threshold * comment * M1 autons * Fix GC auto, default CBA * Clean constant --------- Co-authored-by: Prog694 <[email protected]>
StuyPulse · May 8, 2024 · 9d87418 · 9d87418
1 parent 82897e1
commit 9d87418
Show file tree

Hide file tree

Showing 27 changed files with 865 additions and 81 deletions.
diff --git a/shuffleboard.json b/shuffleboard.json
@@ -165,6 +165,19 @@
               "imageWidth": 0,
               "imageHeight": 0
             }
+          },
+          "6,3": {
+            "size": [
+              4,
+              1
+            ],
+            "content": {
+              "_type": "Toggle Button",
+              "_source0": "network_table:///SmartDashboard/Amper/Reset Minimum Lift Height",
+              "_title": "RESET SAFE HEIGHT",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
           }
         }
       }
@@ -174,6 +187,6 @@
     "x": -7.199999809265137,
     "y": -7.199999809265137,
     "width": 1550.4000244140625,
-    "height": 838.4000244140625
+    "height": 830.4000244140625
   }
 }
diff --git a/src/main/deploy/pathplanner/paths/B to F.path b/src/main/deploy/pathplanner/paths/B to F.path
@@ -0,0 +1,52 @@
+{
+  "version": 1.0,
+  "waypoints": [
+    {
+      "anchor": {
+        "x": 2.9,
+        "y": 5.27
+      },
+      "prevControl": null,
+      "nextControl": {
+        "x": 4.511078009317217,
+        "y": 5.211322262872771
+      },
+      "isLocked": false,
+      "linkedName": "B"
+    },
+    {
+      "anchor": {
+        "x": 8.141437338509483,
+        "y": 4.0
+      },
+      "prevControl": {
+        "x": 4.991222307694258,
+        "y": 3.72404602155852
+      },
+      "nextControl": null,
+      "isLocked": false,
+      "linkedName": null
+    }
+  ],
+  "rotationTargets": [],
+  "constraintZones": [],
+  "eventMarkers": [],
+  "globalConstraints": {
+    "maxVelocity": 4.5,
+    "maxAcceleration": 4.0,
+    "maxAngularVelocity": 540.0,
+    "maxAngularAcceleration": 720.0
+  },
+  "goalEndState": {
+    "velocity": 0,
+    "rotation": 0,
+    "rotateFast": false
+  },
+  "reversed": false,
+  "folder": "ABCDE",
+  "previewStartingState": {
+    "rotation": 0,
+    "velocity": 0
+  },
+  "useDefaultConstraints": true
+}
diff --git a/src/main/deploy/pathplanner/paths/E to Shoot M120.path b/src/main/deploy/pathplanner/paths/E to Shoot M120.path
@@ -0,0 +1,49 @@
+{
+  "version": 1.0,
+  "waypoints": [
+    {
+      "anchor": {
+        "x": 8.07,
+        "y": 5.84
+      },
+      "prevControl": null,
+      "nextControl": {
+        "x": 6.2677034911844425,
+        "y": 6.979658581285779
+      },
+      "isLocked": false,
+      "linkedName": "E"
+    },
+    {
+      "anchor": {
+        "x": 3.0355126045487455,
+        "y": 5.141057243598081
+      },
+      "prevControl": {
+        "x": 4.651608047866594,
+        "y": 7.108477783289376
+      },
+      "nextControl": null,
+      "isLocked": false,
+      "linkedName": null
+    }
+  ],
+  "rotationTargets": [],
+  "constraintZones": [],
+  "eventMarkers": [],
+  "globalConstraints": {
+    "maxVelocity": 4.0,
+    "maxAcceleration": 4.0,
+    "maxAngularVelocity": 540.0,
+    "maxAngularAcceleration": 720.0
+  },
+  "goalEndState": {
+    "velocity": 0,
+    "rotation": -4.763641690726144,
+    "rotateFast": false
+  },
+  "reversed": false,
+  "folder": "ABCDE",
+  "previewStartingState": null,
+  "useDefaultConstraints": false
+}
diff --git a/src/main/deploy/pathplanner/paths/F to Shoot (TopFerry).path b/src/main/deploy/pathplanner/paths/F to Shoot (TopFerry).path
@@ -4,12 +4,12 @@
     {
       "anchor": {
         "x": 8.16,
-        "y": 3.993395262111494
+        "y": 4.2
       },
       "prevControl": null,
       "nextControl": {
         "x": 5.1946410831710566,
-        "y": 3.433578730441394
+        "y": 3.6401834683299
       },
       "isLocked": false,
       "linkedName": "F Top Ferry"

diff --git a/src/main/deploy/pathplanner/paths/Ferry Shot to F.path b/src/main/deploy/pathplanner/paths/Ferry Shot to F.path
@@ -8,20 +8,20 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 6.430631429227235,
-        "y": 6.476519652113379
+        "x": 7.017173635968985,
+        "y": 6.710606894650749
       },
       "isLocked": false,
       "linkedName": "Ferry Shot E"
     },
     {
       "anchor": {
         "x": 8.16,
-        "y": 3.993395262111494
+        "y": 4.2
       },
       "prevControl": {
-        "x": 8.144797599224828,
-        "y": 3.9781928613363213
+        "x": 6.4641411145582985,
+        "y": 4.318586005365013
       },
       "nextControl": null,
       "isLocked": false,
@@ -39,7 +39,7 @@
   },
   "goalEndState": {
     "velocity": 0,
-    "rotation": -47.12109639666155,
+    "rotation": -9.990487112475767,
     "rotateFast": false
   },
   "reversed": false,

diff --git a/src/main/deploy/pathplanner/paths/M76 E to Midline.path b/src/main/deploy/pathplanner/paths/M76 E to Midline.path
@@ -0,0 +1,49 @@
+{
+  "version": 1.0,
+  "waypoints": [
+    {
+      "anchor": {
+        "x": 8.07,
+        "y": 5.84
+      },
+      "prevControl": null,
+      "nextControl": {
+        "x": 8.164859011601047,
+        "y": 4.286166175756032
+      },
+      "isLocked": false,
+      "linkedName": "E"
+    },
+    {
+      "anchor": {
+        "x": 8.281967377058862,
+        "y": 0.9837102698456457
+      },
+      "prevControl": {
+        "x": 8.258545703967298,
+        "y": 3.5952268195549233
+      },
+      "nextControl": null,
+      "isLocked": false,
+      "linkedName": null
+    }
+  ],
+  "rotationTargets": [],
+  "constraintZones": [],
+  "eventMarkers": [],
+  "globalConstraints": {
+    "maxVelocity": 4.5,
+    "maxAcceleration": 4.0,
+    "maxAngularVelocity": 540.0,
+    "maxAngularAcceleration": 720.0
+  },
+  "goalEndState": {
+    "velocity": 0,
+    "rotation": -88.0908475670037,
+    "rotateFast": true
+  },
+  "reversed": false,
+  "folder": "Top Ferry",
+  "previewStartingState": null,
+  "useDefaultConstraints": true
+}
diff --git a/src/main/deploy/pathplanner/paths/M76 Midline.path b/src/main/deploy/pathplanner/paths/M76 Midline.path
@@ -0,0 +1,55 @@
+{
+  "version": 1.0,
+  "waypoints": [
+    {
+      "anchor": {
+        "x": 5.15,
+        "y": 6.563657142562062
+      },
+      "prevControl": null,
+      "nextControl": {
+        "x": 8.621581636886527,
+        "y": 6.241875878901544
+      },
+      "isLocked": false,
+      "linkedName": "Ferry Shot E"
+    },
+    {
+      "anchor": {
+        "x": 8.281967377058862,
+        "y": 0.9837102698456457
+      },
+      "prevControl": {
+        "x": 8.258545703967298,
+        "y": 6.347273407813577
+      },
+      "nextControl": null,
+      "isLocked": false,
+      "linkedName": null
+    }
+  ],
+  "rotationTargets": [
+    {
+      "waypointRelativePos": 0.5,
+      "rotationDegrees": -90.42948668810303,
+      "rotateFast": false
+    }
+  ],
+  "constraintZones": [],
+  "eventMarkers": [],
+  "globalConstraints": {
+    "maxVelocity": 4.5,
+    "maxAcceleration": 4.0,
+    "maxAngularVelocity": 540.0,
+    "maxAngularAcceleration": 720.0
+  },
+  "goalEndState": {
+    "velocity": 0,
+    "rotation": -88.0908475670037,
+    "rotateFast": false
+  },
+  "reversed": false,
+  "folder": "Top Ferry",
+  "previewStartingState": null,
+  "useDefaultConstraints": true
+}
diff --git a/src/main/deploy/pathplanner/paths/Preload to C.path b/src/main/deploy/pathplanner/paths/Preload to C.path
@@ -16,11 +16,11 @@
     },
     {
       "anchor": {
-        "x": 2.493344245947751,
+        "x": 2.55,
         "y": 4.163118981508619
       },
       "prevControl": {
-        "x": 2.4591143420431036,
+        "x": 2.5157700960953524,
         "y": 4.3868765258208615
       },
       "nextControl": null,

diff --git a/src/main/deploy/pathplanner/paths/Rerouted Ferry Shot to F.path b/src/main/deploy/pathplanner/paths/Rerouted Ferry Shot to F.path
@@ -8,20 +8,20 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 6.430631429227235,
-        "y": 6.476519652113379
+        "x": 7.01423541408095,
+        "y": 6.710375651573131
       },
       "isLocked": false,
       "linkedName": "Ferry Shot E"
     },
     {
       "anchor": {
         "x": 8.16,
-        "y": 3.993395262111494
+        "y": 4.2
       },
       "prevControl": {
-        "x": 8.144797599224828,
-        "y": 3.9781928613363213
+        "x": 6.4641411145582985,
+        "y": 4.318586005365013
       },
       "nextControl": null,
       "isLocked": false,
@@ -39,7 +39,7 @@
   },
   "goalEndState": {
     "velocity": 0,
-    "rotation": -47.12109639666155,
+    "rotation": -10.607457530402133,
     "rotateFast": false
   },
   "reversed": false,