Merge pull request #19 from frc461/inmis-2024

Inmis 2024
frc461 · Mar 4, 2024 · 62a8e2c · 62a8e2c
2 parents 3591aad + 6b2b3b4
commit 62a8e2c
Show file tree

Hide file tree

Showing 18 changed files with 174 additions and 138 deletions.
diff --git a/.SysId/sysid.json b/.SysId/sysid.json
@@ -0,0 +1 @@
+{}
diff --git a/src/main/deploy/pathplanner/autos/2PLeft.auto b/src/main/deploy/pathplanner/autos/2PLeft.auto
@@ -2,8 +2,8 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 0.6445593933841892,
-      "y": 6.546038494920592
+      "x": 0.8093860062363999,
+      "y": 6.5136440244390466
     },
     "rotation": -120.0
   },

diff --git a/src/main/deploy/pathplanner/autos/2PRight.auto b/src/main/deploy/pathplanner/autos/2PRight.auto
@@ -2,8 +2,8 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 0.59,
-      "y": 4.48
+      "x": 0.7509152340242001,
+      "y": 4.584108541436456
     },
     "rotation": 120.0
   },
@@ -26,7 +26,7 @@
         {
           "type": "named",
           "data": {
-            "name": "waitUntilIntakeNote"
+            "name": "intakeNote"
           }
         },
         {

diff --git a/src/main/deploy/pathplanner/paths/0.1.1.path b/src/main/deploy/pathplanner/paths/0.1.1.path
@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 2.648119714634566,
-        "y": 4.139586257963229
+        "x": 2.63367409925703,
+        "y": 4.268366371490578
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.513955899022054,
-        "y": 2.8019519157865354
+        "x": 1.4995102836445182,
+        "y": 2.9307320293138845
       },
       "isLocked": false,
       "linkedName": "0.1.0"
@@ -32,12 +32,12 @@
     },
     {
       "anchor": {
-        "x": 2.648119714634566,
-        "y": 4.139586257963229
+        "x": 2.63367409925703,
+        "y": 4.268366371490578
       },
       "prevControl": {
-        "x": 1.5106099408694202,
-        "y": 2.8126566883101862
+        "x": 1.4961643254918844,
+        "y": 2.9414368018375354
       },
       "nextControl": null,
       "isLocked": false,
@@ -79,13 +79,13 @@
   },
   "goalEndState": {
     "velocity": 0,
-    "rotation": 155.0,
+    "rotation": 175.0,
     "rotateFast": false
   },
   "reversed": false,
   "folder": null,
   "previewStartingState": {
-    "rotation": 155.0,
+    "rotation": 175.0,
     "velocity": 0
   },
   "useDefaultConstraints": true

diff --git a/src/main/deploy/pathplanner/paths/0.1to2.0.path b/src/main/deploy/pathplanner/paths/0.1to2.0.path
@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 2.648119714634566,
-        "y": 4.139586257963229
+        "x": 2.63367409925703,
+        "y": 4.268366371490578
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.319295743345008,
-        "y": 4.264398524533186
+        "x": 2.3048501279674722,
+        "y": 4.393178638060535
       },
       "isLocked": false,
       "linkedName": "0.1.0"
@@ -69,7 +69,7 @@
   "reversed": false,
   "folder": null,
   "previewStartingState": {
-    "rotation": 155.0,
+    "rotation": 175.0,
     "velocity": 0
   },
   "useDefaultConstraints": true

diff --git a/src/main/deploy/pathplanner/paths/0.2to3.0.path b/src/main/deploy/pathplanner/paths/0.2to3.0.path
@@ -16,12 +16,12 @@
     },
     {
       "anchor": {
-        "x": 2.9,
-        "y": 6.871393041861788
+        "x": 3.019581195857548,
+        "y": 6.759221267730286
       },
       "prevControl": {
-        "x": 2.8237644337717156,
-        "y": 6.63043333180499
+        "x": 2.9433456296292637,
+        "y": 6.518261557673488
       },
       "nextControl": null,
       "isLocked": false,

diff --git a/src/main/deploy/pathplanner/paths/0.2to3.0Backup.path b/src/main/deploy/pathplanner/paths/0.2to3.0Backup.path
@@ -16,28 +16,28 @@
     },
     {
       "anchor": {
-        "x": 2.2913654172103683,
-        "y": 6.548000849460931
+        "x": 1.7816440316721391,
+        "y": 6.623191138653941
       },
       "prevControl": {
-        "x": 2.11010385980304,
-        "y": 6.463477197112792
+        "x": 1.6279997757526636,
+        "y": 6.495154258721045
       },
       "nextControl": {
-        "x": 2.6340519755420364,
-        "y": 6.707798215957768
+        "x": 1.9921388116360583,
+        "y": 6.79860345529054
       },
       "isLocked": false,
       "linkedName": null
     },
     {
       "anchor": {
-        "x": 3.5528154585413483,
-        "y": 7.191419869023442
+        "x": 3.4288766013429455,
+        "y": 7.390705607622041
       },
       "prevControl": {
-        "x": 3.0301074939608057,
-        "y": 6.947677142160924
+        "x": 3.0429695047424277,
+        "y": 7.156822518773243
       },
       "nextControl": null,
       "isLocked": false,
@@ -47,7 +47,7 @@
   "rotationTargets": [
     {
       "waypointRelativePos": 1.3,
-      "rotationDegrees": -155.0,
+      "rotationDegrees": -145.0,
       "rotateFast": false
     }
   ],

diff --git a/src/main/deploy/pathplanner/paths/0.3.5.path b/src/main/deploy/pathplanner/paths/0.3.5.path
@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 2.9,
-        "y": 6.871393041861788
+        "x": 3.019581195857548,
+        "y": 6.759221267730286
       },
       "prevControl": null,
       "nextControl": {
-        "x": 3.2112463242174503,
-        "y": 6.921775161806541
+        "x": 3.3308275200749984,
+        "y": 6.809603387675039
       },
       "isLocked": false,
       "linkedName": "0.3.0"
@@ -32,12 +32,12 @@
     },
     {
       "anchor": {
-        "x": 2.9,
-        "y": 6.871393041861788
+        "x": 3.019581195857548,
+        "y": 6.759221267730286
       },
       "prevControl": {
-        "x": 3.2710929782970672,
-        "y": 6.871452426239816
+        "x": 3.3906741741546154,
+        "y": 6.7592806521083135
       },
       "nextControl": null,
       "isLocked": false,

diff --git a/src/main/deploy/pathplanner/paths/1.1.0.path b/src/main/deploy/pathplanner/paths/1.1.0.path
@@ -3,25 +3,25 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 0.5861994662377946,
-        "y": 4.4839877357479825
+        "x": 0.7509152340242001,
+        "y": 4.584108541436456
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.256400927916568,
-        "y": 4.362018816398439
+        "x": 1.2069872572793579,
+        "y": 3.98770666487202
       },
       "isLocked": false,
       "linkedName": "1.0.0"
     },
     {
       "anchor": {
-        "x": 2.648119714634566,
-        "y": 4.139586257963229
+        "x": 2.63367409925703,
+        "y": 4.268366371490578
       },
       "prevControl": {
-        "x": 2.105181767925706,
-        "y": 4.207348747141377
+        "x": 2.022826607315057,
+        "y": 4.291899095035968
       },
       "nextControl": null,
       "isLocked": false,
@@ -57,7 +57,7 @@
   },
   "goalEndState": {
     "velocity": 0,
-    "rotation": 155.0,
+    "rotation": 165.0,
     "rotateFast": true
   },
   "reversed": false,

diff --git a/src/main/deploy/pathplanner/paths/1.1.0Backup.path b/src/main/deploy/pathplanner/paths/1.1.0Backup.path
@@ -3,29 +3,29 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 0.5861994662377946,
-        "y": 4.4839877357479825
+        "x": 0.7509152340242001,
+        "y": 4.584108541436456
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.084212339720976,
-        "y": 4.287373940488622
+        "x": 1.2489281075073815,
+        "y": 4.3874947461770955
       },
       "isLocked": false,
       "linkedName": "1.0.0"
     },
     {
       "anchor": {
-        "x": 2.648119714634566,
-        "y": 4.139586257963229
+        "x": 2.63367409925703,
+        "y": 4.268366371490578
       },
       "prevControl": {
-        "x": 2.1041588118979457,
-        "y": 4.096235662002777
+        "x": 2.08971319652041,
+        "y": 4.225015775530126
       },
       "nextControl": {
-        "x": 2.965812957283862,
-        "y": 4.1649046059036205
+        "x": 2.951367341906326,
+        "y": 4.29368471943097
       },
       "isLocked": false,
       "linkedName": "0.1.0"

diff --git a/src/main/deploy/pathplanner/paths/3.3.0.path b/src/main/deploy/pathplanner/paths/3.3.0.path
@@ -3,25 +3,25 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 0.6445593933841892,
-        "y": 6.546038494920592
+        "x": 0.8093860062363999,
+        "y": 6.5136440244390466
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.2773817527787459,
-        "y": 6.622127539823412
+        "x": 1.5695060449949958,
+        "y": 6.993104356579084
       },
       "isLocked": false,
       "linkedName": "3.0.0"
     },
     {
       "anchor": {
-        "x": 2.9,
-        "y": 6.871393041861788
+        "x": 3.019581195857548,
+        "y": 6.759221267730286
       },
       "prevControl": {
-        "x": 1.990031584046443,
-        "y": 6.402583990866155
+        "x": 2.109612779903991,
+        "y": 6.290412216734653
       },
       "nextControl": null,
       "isLocked": false,

diff --git a/src/main/deploy/pathplanner/paths/3.3.0Backup.path b/src/main/deploy/pathplanner/paths/3.3.0Backup.path
@@ -3,29 +3,29 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 0.6445593933841892,
-        "y": 6.546038494920592
+        "x": 0.8093860062363999,
+        "y": 6.5136440244390466
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.046472863877797,
-        "y": 7.0909495477056605
+        "x": 1.2112994767300076,
+        "y": 7.058555077224115
       },
       "isLocked": false,
       "linkedName": "3.0.0"
     },
     {
       "anchor": {
-        "x": 2.9,
-        "y": 6.871393041861788
+        "x": 3.019581195857548,
+        "y": 6.759221267730286
       },
       "prevControl": {
-        "x": 1.9691262332366692,
-        "y": 6.763289832676609
+        "x": 2.0887074290942174,
+        "y": 6.651118058545107
       },
       "nextControl": {
-        "x": 3.113576828389689,
-        "y": 6.896195911360191
+        "x": 3.233158024247237,
+        "y": 6.784024137228689
       },
       "isLocked": false,
       "linkedName": "0.3.0"