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

Team334 · Apr 3, 2024 · ca4da94 · ca4da94
2 parents c7d74fb + f300687
commit ca4da94
Show file tree

Hide file tree

Showing 91 changed files with 170 additions and 3,234 deletions.
diff --git a/.pathplanner/settings.json b/.pathplanner/settings.json
@@ -1,17 +1,20 @@
 {
-  "robotWidth": 0.8,
-  "robotLength": 0.8,
+  "robotWidth": 0.82,
+  "robotLength": 0.82,
   "holonomicMode": true,
   "pathFolders": [
     "Continuations",
     "Starting Paths"
   ],
   "autoFolders": [
-    "New Autons"
+    "1 Piece",
+    "2 Piece",
+    "3 Piece",
+    "4 Piece"
   ],
-  "defaultMaxVel": 4.0,
+  "defaultMaxVel": 4.6,
   "defaultMaxAccel": 3.0,
-  "defaultMaxAngVel": 360.0,
+  "defaultMaxAngVel": 450.0,
   "defaultMaxAngAccel": 360.0,
-  "maxModuleSpeed": 4.67
+  "maxModuleSpeed": 4.6
 }
diff --git a/...autos/1 Piece Auton Bottom Subwoofer.auto → ...anner/autos/1 Piece Bottom Subwoofer.auto b/...autos/1 Piece Auton Bottom Subwoofer.auto → ...anner/autos/1 Piece Bottom Subwoofer.auto
@@ -20,6 +20,6 @@
       ]
     }
   },
-  "folder": "New Autons",
+  "folder": "1 Piece",
   "choreoAuto": false
 }
diff --git a/...autos/1 Piece Auton Center Subwoofer.auto → ...anner/autos/1 Piece Center Subwoofer.auto b/...autos/1 Piece Auton Center Subwoofer.auto → ...anner/autos/1 Piece Center Subwoofer.auto
@@ -20,6 +20,6 @@
       ]
     }
   },
-  "folder": "New Autons",
+  "folder": "1 Piece",
   "choreoAuto": false
 }
diff --git a/...er/autos/1 Piece Auton Top Subwoofer.auto → ...hplanner/autos/1 Piece Top Subwoofer.auto b/...er/autos/1 Piece Auton Top Subwoofer.auto → ...hplanner/autos/1 Piece Top Subwoofer.auto
@@ -20,6 +20,6 @@
       ]
     }
   },
-  "folder": "New Autons",
+  "folder": "1 Piece",
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/2 Piece Auton C.auto b/src/main/deploy/pathplanner/autos/2 Piece Auton C.auto
diff --git a/src/main/deploy/pathplanner/autos/2 Piece Auton Line (Bottom).auto b/src/main/deploy/pathplanner/autos/2 Piece Auton Line (Bottom).auto
diff --git a/src/main/deploy/pathplanner/autos/2 Piece Auton Line (Center).auto b/src/main/deploy/pathplanner/autos/2 Piece Auton Line (Center).auto
diff --git a/src/main/deploy/pathplanner/autos/2 Piece Auton S.auto b/src/main/deploy/pathplanner/autos/2 Piece Auton S.auto
diff --git a/.../2 Piece Auton from Bottom Subwoofer.auto → ...from Bottom Subwoofer to Bottom Note.auto b/.../2 Piece Auton from Bottom Subwoofer.auto → ...from Bottom Subwoofer to Bottom Note.auto
@@ -38,6 +38,6 @@
       ]
     }
   },
-  "folder": "New Autons",
+  "folder": "2 Piece",
   "choreoAuto": false
 }
diff --git a/.../2 Piece Auton from Center Subwoofer.auto → ...from Center Subwoofer to Center Note.auto b/.../2 Piece Auton from Center Subwoofer.auto → ...from Center Subwoofer to Center Note.auto
@@ -38,6 +38,6 @@
       ]
     }
   },
-  "folder": "New Autons",
+  "folder": "2 Piece",
   "choreoAuto": false
 }
diff --git a/...tos/2 Piece Auton from Top Subwoofer.auto → ...Piece from Top Subwoofer to Top Note.auto b/...tos/2 Piece Auton from Top Subwoofer.auto → ...Piece from Top Subwoofer to Top Note.auto
@@ -38,6 +38,6 @@
       ]
     }
   },
-  "folder": "New Autons",
+  "folder": "2 Piece",
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/3 Piece Auton Line C.auto b/src/main/deploy/pathplanner/autos/3 Piece Auton Line C.auto
diff --git a/src/main/deploy/pathplanner/autos/3 Piece Auton Line S.auto b/src/main/deploy/pathplanner/autos/3 Piece Auton Line S.auto