Merge branch 'main' into shake-off-note

SouthwestRoboticsProgramming · Mar 31, 2024 · 930d954 · 930d954
2 parents fa10b03 + dac9a01
commit 930d954
Show file tree

Hide file tree

Showing 90 changed files with 37,454 additions and 25,983 deletions.
diff --git a/Robot/.pathplanner/settings.json b/Robot/.pathplanner/settings.json
@@ -5,7 +5,9 @@
   "pathFolders": [
     "Troll"
   ],
-  "autoFolders": [],
+  "autoFolders": [
+    "New Autos"
+  ],
   "defaultMaxVel": 4.0,
   "defaultMaxAccel": 3.8,
   "defaultMaxAngVel": 600.0,

diff --git a/Robot/Chreo_Auto_Project.chor b/Robot/Chreo_Auto_Project.chor