Merge branch 'main' of https://github.com/Team334/R2024

Team334 · Mar 14, 2024 · c2ec310 · c2ec310
2 parents 243b791 + b63d820
commit c2ec310
Show file tree

Hide file tree

Showing 31 changed files with 246 additions and 170 deletions.
diff --git a/.pathplanner/settings.json b/.pathplanner/settings.json
@@ -3,11 +3,14 @@
   "robotLength": 0.8,
   "holonomicMode": true,
   "pathFolders": [
-    "reg paths",
-    "straight pickup"
+    "straight paths",
+    "curved paths"
   ],
-  "autoFolders": [],
-  "defaultMaxVel": 3.0,
+  "autoFolders": [
+    "curved",
+    "straight"
+  ],
+  "defaultMaxVel": 4.0,
   "defaultMaxAccel": 3.0,
   "defaultMaxAngVel": 180.0,
   "defaultMaxAngAccel": 360.0,

diff --git a/simgui.json b/simgui.json
@@ -13,7 +13,9 @@
   "NTProvider": {
     "types": {
       "/FMSInfo": "FMSInfo",
+      "/SmartDashboard/ACTUATOR PID": "PIDController",
       "/SmartDashboard/AUTON CHOOSER": "String Chooser",
+      "/SmartDashboard/ELEVATOR PID": "PIDController",
       "/SmartDashboard/FIELD": "Field2d",
       "/SmartDashboard/Gyro": "Gyro",
       "/SmartDashboard/PIDController[1]": "PIDController",

diff --git a/...ploy/pathplanner/autos/2 Piece Auton.auto → ...oy/pathplanner/autos/2 Piece Auton C.auto b/...ploy/pathplanner/autos/2 Piece Auton.auto → ...oy/pathplanner/autos/2 Piece Auton C.auto
@@ -20,13 +20,13 @@
         {
           "type": "path",
           "data": {
-            "pathName": "REAL AUTON OUT"
+            "pathName": "get bot c"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "REAL AUTON IN"
+            "pathName": "shoot bot c"
           }
         },
         {
@@ -38,6 +38,6 @@
       ]
     }
   },
-  "folder": null,
+  "folder": "curved",
   "choreoAuto": false
 }
diff --git a/...planner/autos/2 piece auton straight.auto → ...oy/pathplanner/autos/2 Piece Auton S.auto b/...planner/autos/2 piece auton straight.auto → ...oy/pathplanner/autos/2 Piece Auton S.auto
@@ -20,13 +20,13 @@
         {
           "type": "path",
           "data": {
-            "pathName": "get bot note"
+            "pathName": "get bot s"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "shoot bot note"
+            "pathName": "shoot bot s"
           }
         },
         {
@@ -38,6 +38,6 @@
       ]
     }
   },
-  "folder": null,
+  "folder": "straight",
   "choreoAuto": false
 }
diff --git a/.../autos/Straight Pickup 3 Piece Auton.auto → ...oy/pathplanner/autos/3 Piece Auton C.auto b/.../autos/Straight Pickup 3 Piece Auton.auto → ...oy/pathplanner/autos/3 Piece Auton C.auto
@@ -20,13 +20,13 @@
         {
           "type": "path",
           "data": {
-            "pathName": "get mid"
+            "pathName": "get mid c"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "shoot mid"
+            "pathName": "shoot mid c"
           }
         },
         {
@@ -38,13 +38,13 @@
         {
           "type": "path",
           "data": {
-            "pathName": "REAL AUTON OUT"
+            "pathName": "get bot c"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "REAL AUTON IN"
+            "pathName": "shoot bot c"
           }
         },
         {
@@ -56,6 +56,6 @@
       ]
     }
   },
-  "folder": null,
+  "folder": "curved",
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/3 Piece Auton.auto b/src/main/deploy/pathplanner/autos/3 Piece Auton.auto
diff --git a/.../autos/Straight Pickup 4 Piece Auton.auto → ...oy/pathplanner/autos/4 Piece Auton C.auto b/.../autos/Straight Pickup 4 Piece Auton.auto → ...oy/pathplanner/autos/4 Piece Auton C.auto
@@ -20,13 +20,13 @@
         {
           "type": "path",
           "data": {
-            "pathName": "get mid"
+            "pathName": "get mid c"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "shoot mid"
+            "pathName": "shoot mid c"
           }
         },
         {
@@ -38,13 +38,13 @@
         {
           "type": "path",
           "data": {
-            "pathName": "REAL AUTON OUT"
+            "pathName": "get bot c"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "REAL AUTON IN"
+            "pathName": "shoot bot c"
           }
         },
         {
@@ -56,13 +56,13 @@
         {
           "type": "path",
           "data": {
-            "pathName": "get top"
+            "pathName": "get top c"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "shoot top"
+            "pathName": "shoot top c"
           }
         },
         {
@@ -74,6 +74,6 @@
       ]
     }
   },
-  "folder": null,
+  "folder": "curved",
   "choreoAuto": false
 }
diff --git a/...ploy/pathplanner/autos/4 Piece Auton.auto → ...oy/pathplanner/autos/4 Piece Auton S.auto b/...ploy/pathplanner/autos/4 Piece Auton.auto → ...oy/pathplanner/autos/4 Piece Auton S.auto
@@ -20,13 +20,13 @@
         {
           "type": "path",
           "data": {
-            "pathName": "get bot note"
+            "pathName": "get bot s"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "shoot bot note"
+            "pathName": "shoot bot s"
           }
         },
         {
@@ -38,13 +38,13 @@
         {
           "type": "path",
           "data": {
-            "pathName": "get mid note"
+            "pathName": "get mid s"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "shoot mid note"
+            "pathName": "shoot mid s"
           }
         },
         {
@@ -56,13 +56,13 @@
         {
           "type": "path",
           "data": {
-            "pathName": "get top note"
+            "pathName": "get top s"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "shoot top note"
+            "pathName": "shoot top s"
           }
         },
         {
@@ -74,6 +74,6 @@
       ]
     }
   },
-  "folder": null,
+  "folder": "straight",
   "choreoAuto": false
 }
diff --git a/...loy/pathplanner/paths/REAL AUTON OUT.path → ...n/deploy/pathplanner/paths/get bot c.path b/...loy/pathplanner/paths/REAL AUTON OUT.path → ...n/deploy/pathplanner/paths/get bot c.path
@@ -62,7 +62,7 @@
     }
   ],
   "globalConstraints": {
-    "maxVelocity": 3.0,
+    "maxVelocity": 4.0,
     "maxAcceleration": 3.0,
     "maxAngularVelocity": 180.0,
     "maxAngularAcceleration": 360.0
@@ -73,7 +73,7 @@
     "rotateFast": false
   },
   "reversed": false,
-  "folder": null,
+  "folder": "curved paths",
   "previewStartingState": {
     "rotation": 0,
     "velocity": 0

diff --git a/...eploy/pathplanner/paths/get bot note.path → ...n/deploy/pathplanner/paths/get bot s.path b/...eploy/pathplanner/paths/get bot note.path → ...n/deploy/pathplanner/paths/get bot s.path
@@ -73,7 +73,7 @@
     "rotateFast": false
   },
   "reversed": false,
-  "folder": "reg paths",
+  "folder": "straight paths",
   "previewStartingState": null,
   "useDefaultConstraints": false
 }
diff --git a/...ain/deploy/pathplanner/paths/get mid.path → ...n/deploy/pathplanner/paths/get mid c.path b/...ain/deploy/pathplanner/paths/get mid.path → ...n/deploy/pathplanner/paths/get mid c.path
@@ -62,7 +62,7 @@
     }
   ],
   "globalConstraints": {
-    "maxVelocity": 3.0,
+    "maxVelocity": 4.0,
     "maxAcceleration": 3.0,
     "maxAngularVelocity": 180.0,
     "maxAngularAcceleration": 360.0
@@ -73,7 +73,7 @@
     "rotateFast": false
   },
   "reversed": false,
-  "folder": "straight pickup",
+  "folder": "curved paths",
   "previewStartingState": {
     "rotation": 0,
     "velocity": 0

diff --git a/...eploy/pathplanner/paths/get mid note.path → ...n/deploy/pathplanner/paths/get mid s.path b/...eploy/pathplanner/paths/get mid note.path → ...n/deploy/pathplanner/paths/get mid s.path
@@ -73,7 +73,7 @@
     "rotateFast": false
   },
   "reversed": false,
-  "folder": "reg paths",
+  "folder": "straight paths",
   "previewStartingState": null,
   "useDefaultConstraints": false
 }
diff --git a/...ain/deploy/pathplanner/paths/get top.path → ...n/deploy/pathplanner/paths/get top c.path b/...ain/deploy/pathplanner/paths/get top.path → ...n/deploy/pathplanner/paths/get top c.path
@@ -62,7 +62,7 @@
     }
   ],
   "globalConstraints": {
-    "maxVelocity": 3.0,
+    "maxVelocity": 4.0,
     "maxAcceleration": 3.0,
     "maxAngularVelocity": 180.0,
     "maxAngularAcceleration": 360.0
@@ -73,7 +73,7 @@
     "rotateFast": false
   },
   "reversed": false,
-  "folder": "straight pickup",
+  "folder": "curved paths",
   "previewStartingState": {
     "rotation": 0,
     "velocity": 0

diff --git a/...eploy/pathplanner/paths/get top note.path → ...n/deploy/pathplanner/paths/get top s.path b/...eploy/pathplanner/paths/get top note.path → ...n/deploy/pathplanner/paths/get top s.path
@@ -61,7 +61,7 @@
     "rotateFast": false
   },
   "reversed": false,
-  "folder": "reg paths",
+  "folder": "straight paths",
   "previewStartingState": null,
   "useDefaultConstraints": false
 }