Merge pull request #544 from frc-862/543-talking-is-hard

[#543] talking is hard
frc-862 · Apr 15, 2024 · f583f2c · f583f2c
2 parents 9f1559d + badfe9e
commit f583f2c
Show file tree

Hide file tree

Showing 51 changed files with 494 additions and 1,369 deletions.
diff --git a/.pathplanner/settings.json b/.pathplanner/settings.json
@@ -10,7 +10,8 @@
     "Top side paths"
   ],
   "autoFolders": [
-    "Point Blank"
+    "Hide",
+    "New Folder"
   ],
   "defaultMaxVel": 5.0,
   "defaultMaxAccel": 4.0,

diff --git a/src/main/deploy/pathplanner/autos/2-SB-[C3]-EC.auto b/src/main/deploy/pathplanner/autos/2-SB-[C3]-EC.auto
@@ -121,6 +121,6 @@
       ]
     }
   },
-  "folder": null,
+  "folder": "New Folder",
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/2-SF-[C2]-EC.auto b/src/main/deploy/pathplanner/autos/2-SF-[C2]-EC.auto
@@ -18,7 +18,32 @@
               {
                 "type": "wait",
                 "data": {
-                  "waitTime": 4.0
+                  "waitTime": 6.0
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "Enable-Vision"
+          }
+        },
+        {
+          "type": "deadline",
+          "data": {
+            "commands": [
+              {
+                "type": "wait",
+                "data": {
+                  "waitTime": 1.0
+                }
+              },
+              {
+                "type": "named",
+                "data": {
+                  "name": "Stop-Flywheel"
                 }
               }
             ]
@@ -39,6 +64,12 @@
                 "data": {
                   "name": "Smart-Collect"
                 }
+              },
+              {
+                "type": "named",
+                "data": {
+                  "name": "Stop-Flywheel"
+                }
               }
             ]
           }
@@ -65,6 +96,6 @@
       ]
     }
   },
-  "folder": null,
+  "folder": "New Folder",
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/2-ST-[C1]-EC.auto b/src/main/deploy/pathplanner/autos/2-ST-[C1]-EC.auto
@@ -24,20 +24,26 @@
             ]
           }
         },
+        {
+          "type": "named",
+          "data": {
+            "name": "Enable-Vision"
+          }
+        },
         {
           "type": "deadline",
           "data": {
             "commands": [
               {
-                "type": "path",
+                "type": "wait",
                 "data": {
-                  "pathName": "ST-C1"
+                  "waitTime": 1.0
                 }
               },
               {
                 "type": "named",
                 "data": {
-                  "name": "Smart-Collect"
+                  "name": "Stop-Flywheel"
                 }
               }
             ]
@@ -48,26 +54,38 @@
           "data": {
             "commands": [
               {
-                "type": "named",
+                "type": "path",
                 "data": {
-                  "name": "Point-At-Speaker"
+                  "pathName": "ST-C1"
                 }
               },
               {
                 "type": "named",
                 "data": {
-                  "name": "preAim"
+                  "name": "Smart-Collect"
                 }
               },
               {
                 "type": "named",
                 "data": {
-                  "name": "Smart-Collect"
+                  "name": "Stop-Flywheel"
                 }
               }
             ]
           }
         },
+        {
+          "type": "named",
+          "data": {
+            "name": "Point-At-Speaker"
+          }
+        },
+        {
+          "type": "wait",
+          "data": {
+            "waitTime": 2.0
+          }
+        },
         {
           "type": "deadline",
           "data": {
@@ -90,6 +108,6 @@
       ]
     }
   },
-  "folder": null,
+  "folder": "New Folder",
   "choreoAuto": false
 }