Fixed PR comments

DeepBlueRobotics · Jun 20, 2024 · 68f72f8 · 68f72f8
1 parent 0b0c133
commit 68f72f8
Show file tree

Hide file tree

Showing 15 changed files with 295 additions and 342 deletions.
diff --git a/src/main/deploy/pathplanner/autos/Left Auton 4 piece total.auto b/src/main/deploy/pathplanner/autos/Left Auton 4 piece total.auto
@@ -26,12 +26,6 @@
                 "data": {
                   "name": "SwitchRPMShoot"
                 }
-              },
-              {
-                "type": "wait",
-                "data": {
-                  "waitTime": 1.5
-                }
               }
             ]
           }
@@ -43,30 +37,37 @@
           }
         },
         {
-          "type": "parallel",
+          "type": "deadline",
           "data": {
             "commands": [
               {
-                "type": "named",
+                "type": "path",
                 "data": {
-                  "name": "Intake"
+                  "pathName": "Preloaded Left-Pickup Subwoofer"
                 }
               },
               {
-                "type": "path",
+                "type": "sequential",
                 "data": {
-                  "pathName": "Preloaded Left-Pickup Subwoofer"
+                  "commands": [
+                    {
+                      "type": "named",
+                      "data": {
+                        "name": "Intake"
+                      }
+                    },
+                    {
+                      "type": "named",
+                      "data": {
+                        "name": "ArmToSubwoofer"
+                      }
+                    }
+                  ]
                 }
               }
             ]
           }
         },
-        {
-          "type": "named",
-          "data": {
-            "name": "ArmToSubwoofer"
-          }
-        },
         {
           "type": "sequential",
           "data": {
@@ -76,12 +77,6 @@
                 "data": {
                   "name": "SwitchRPMShoot"
                 }
-              },
-              {
-                "type": "wait",
-                "data": {
-                  "waitTime": 1.5
-                }
               }
             ]
           }
@@ -93,30 +88,37 @@
           }
         },
         {
-          "type": "parallel",
+          "type": "deadline",
           "data": {
             "commands": [
               {
-                "type": "named",
+                "type": "path",
                 "data": {
-                  "name": "Intake"
+                  "pathName": "Preloaded Left-Pickup Subwoofer 2"
                 }
               },
               {
-                "type": "path",
+                "type": "sequential",
                 "data": {
-                  "pathName": "Preloaded Left-Pickup Subwoofer 2"
+                  "commands": [
+                    {
+                      "type": "named",
+                      "data": {
+                        "name": "Intake"
+                      }
+                    },
+                    {
+                      "type": "named",
+                      "data": {
+                        "name": "ArmToSubwoofer"
+                      }
+                    }
+                  ]
                 }
               }
             ]
           }
         },
-        {
-          "type": "named",
-          "data": {
-            "name": "ArmToSubwoofer"
-          }
-        },
         {
           "type": "sequential",
           "data": {
@@ -126,12 +128,6 @@
                 "data": {
                   "name": "SwitchRPMShoot"
                 }
-              },
-              {
-                "type": "wait",
-                "data": {
-                  "waitTime": 1.5
-                }
               }
             ]
           }
@@ -143,30 +139,37 @@
           }
         },
         {
-          "type": "parallel",
+          "type": "deadline",
           "data": {
             "commands": [
               {
-                "type": "named",
+                "type": "path",
                 "data": {
-                  "name": "Intake"
+                  "pathName": "Preloaded Left-Pickup Subwoofer 3"
                 }
               },
               {
-                "type": "path",
+                "type": "sequential",
                 "data": {
-                  "pathName": "Preloaded Left-Pickup Subwoofer 3"
+                  "commands": [
+                    {
+                      "type": "named",
+                      "data": {
+                        "name": "Intake"
+                      }
+                    },
+                    {
+                      "type": "named",
+                      "data": {
+                        "name": "ArmToSubwoofer"
+                      }
+                    }
+                  ]
                 }
               }
             ]
           }
         },
-        {
-          "type": "named",
-          "data": {
-            "name": "ArmToSubwoofer"
-          }
-        },
         {
           "type": "sequential",
           "data": {
@@ -176,15 +179,15 @@
                 "data": {
                   "name": "SwitchRPMShoot"
                 }
-              },
-              {
-                "type": "wait",
-                "data": {
-                  "waitTime": 1.5
-                }
               }
             ]
           }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "ArmToGround"
+          }
         }
       ]
     }

diff --git a/src/main/deploy/pathplanner/autos/Preloaded Center Auton 3 piece total.auto b/src/main/deploy/pathplanner/autos/Preloaded Center Auton 3 piece total.auto
@@ -43,19 +43,19 @@
           }
         },
         {
-          "type": "parallel",
+          "type": "deadline",
           "data": {
             "commands": [
               {
-                "type": "named",
+                "type": "path",
                 "data": {
-                  "name": "Intake"
+                  "pathName": "Center-Pickup"
                 }
               },
               {
-                "type": "path",
+                "type": "named",
                 "data": {
-                  "pathName": "Center-Pickup"
+                  "name": "Intake"
                 }
               }
             ]
@@ -93,19 +93,19 @@
           }
         },
         {
-          "type": "parallel",
+          "type": "deadline",
           "data": {
             "commands": [
               {
-                "type": "named",
+                "type": "path",
                 "data": {
-                  "name": "Intake"
+                  "pathName": "Center-Pickup 2"
                 }
               },
               {
-                "type": "path",
+                "type": "named",
                 "data": {
-                  "pathName": "Center-Pickup 2"
+                  "name": "Intake"
                 }
               }
             ]