Cleanup

2491-NoMythic · Mar 20, 2024 · d08cca8 · d08cca8
1 parent 5224c2d
commit d08cca8
Show file tree

Hide file tree

Showing 23 changed files with 22 additions and 87 deletions.
diff --git a/...hplanner/autos/StartMLeft3AutoPickup.auto → ...oy/pathplanner/autos/(AP)StartMLeft3.auto b/...hplanner/autos/StartMLeft3AutoPickup.auto → ...oy/pathplanner/autos/(AP)StartMLeft3.auto
diff --git a/...athplanner/autos/StartAmpScore3Close.auto → ...r/autos/Obsolete/StartAmpScore3Close.auto b/...athplanner/autos/StartAmpScore3Close.auto → ...r/autos/Obsolete/StartAmpScore3Close.auto
diff --git a/...thplanner/autos/StartAmpScore3FarAmp.auto → .../autos/Obsolete/StartAmpScore3FarAmp.auto b/...thplanner/autos/StartAmpScore3FarAmp.auto → .../autos/Obsolete/StartAmpScore3FarAmp.auto
diff --git a/...deploy/pathplanner/autos/StartMLeft3.auto → ...thplanner/autos/Obsolete/StartMLeft3.auto b/...deploy/pathplanner/autos/StartMLeft3.auto → ...thplanner/autos/Obsolete/StartMLeft3.auto
diff --git a/...athplanner/autos/StartMidScore3Close.auto → ...r/autos/Obsolete/StartMidScore3Close.auto b/...athplanner/autos/StartMidScore3Close.auto → ...r/autos/Obsolete/StartMidScore3Close.auto
diff --git a/...lanner/autos/StartMidScore3FarSource.auto → ...tos/Obsolete/StartMidScore3FarSource.auto b/...lanner/autos/StartMidScore3FarSource.auto → ...tos/Obsolete/StartMidScore3FarSource.auto
diff --git a/...planner/autos/StartSourceScore3Close.auto → ...utos/Obsolete/StartSourceScore3Close.auto b/...planner/autos/StartSourceScore3Close.auto → ...utos/Obsolete/StartSourceScore3Close.auto
diff --git a/src/main/deploy/pathplanner/autos/StartMid2Close1FarAmpSide.auto b/src/main/deploy/pathplanner/autos/StartMid2Close1FarAmpSide.auto
@@ -18,122 +18,63 @@
           }
         },
         {
-          "type": "race",
+          "type": "named",
           "data": {
-            "commands": [
-              {
-                "type": "path",
-                "data": {
-                  "pathName": "CloseMidPickup"
-                }
-              },
-              {
-                "type": "named",
-                "data": {
-                  "name": "groundIntake"
-                }
-              }
-            ]
+            "name": "shooterOn"
           }
         },
         {
-          "type": "race",
+          "type": "path",
           "data": {
-            "commands": [
-              {
-                "type": "named",
-                "data": {
-                  "name": "groundIntake"
-                }
-              },
-              {
-                "type": "wait",
-                "data": {
-                  "waitTime": 2.0
-                }
-              }
-            ]
+            "pathName": "CloseMidPickupAuto"
           }
         },
         {
           "type": "named",
           "data": {
-            "name": "autoShootNote"
+            "name": "autoPickup"
           }
         },
         {
-          "type": "race",
+          "type": "named",
           "data": {
-            "commands": [
-              {
-                "type": "path",
-                "data": {
-                  "pathName": "CloseAmpPickupFromMiddle"
-                }
-              },
-              {
-                "type": "named",
-                "data": {
-                  "name": "groundIntake"
-                }
-              }
-            ]
+            "name": "autoShootNote"
           }
         },
         {
-          "type": "race",
+          "type": "path",
           "data": {
-            "commands": [
-              {
-                "type": "named",
-                "data": {
-                  "name": "groundIntake"
-                }
-              },
-              {
-                "type": "wait",
-                "data": {
-                  "waitTime": 2.0
-                }
-              }
-            ]
+            "pathName": "CloseAmpPickupFromMidAuto"
           }
         },
         {
           "type": "named",
           "data": {
-            "name": "autoShootNote"
+            "name": "autoPickup"
           }
         },
         {
           "type": "named",
           "data": {
-            "name": "shooterOn"
+            "name": "autoShootNote"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "Blue1Pickup"
+            "pathName": "Blue1AutoPickup"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "autoPickup"
           }
         },
         {
-          "type": "race",
+          "type": "path",
           "data": {
-            "commands": [
-              {
-                "type": "path",
-                "data": {
-                  "pathName": "BlueAmpShoot1"
-                }
-              },
-              {
-                "type": "named",
-                "data": {
-                  "name": "autoAimAtSpeaker"
-                }
-              }
-            ]
+            "pathName": "BlueAmpShoot1"
           }
         },
         {

diff --git a/src/main/deploy/pathplanner/autos/StartMidScoreCloseMid.auto b/src/main/deploy/pathplanner/autos/StartMidScoreCloseMid.auto
@@ -30,13 +30,7 @@
               {
                 "type": "path",
                 "data": {
-                  "pathName": "CloseMidPickup"
-                }
-              },
-              {
-                "type": "named",
-                "data": {
-                  "name": "groundIntake"
+                  "pathName": "CloseMidPickupAuto"
                 }
               }
             ]
@@ -45,7 +39,7 @@
         {
           "type": "named",
           "data": {
-            "name": "driveBackwardsToIntake"
+            "name": "autoPickup"
           }
         },
         {

diff --git a/...eploy/pathplanner/autos/ShuffleShoot.auto → ...athplanner/autos/Unused/ShuffleShoot.auto b/...eploy/pathplanner/autos/ShuffleShoot.auto → ...athplanner/autos/Unused/ShuffleShoot.auto
diff --git a/...deploy/pathplanner/paths/Blue1Pickup.path → ...thplanner/paths/Obsolete/Blue1Pickup.path b/...deploy/pathplanner/paths/Blue1Pickup.path → ...thplanner/paths/Obsolete/Blue1Pickup.path
diff --git a/...deploy/pathplanner/paths/Blue2Pickup.path → ...thplanner/paths/Obsolete/Blue2Pickup.path b/...deploy/pathplanner/paths/Blue2Pickup.path → ...thplanner/paths/Obsolete/Blue2Pickup.path
diff --git a/...pathplanner/paths/Blue3PickupAmpSide.path → ...er/paths/Obsolete/Blue3PickupAmpSide.path b/...pathplanner/paths/Blue3PickupAmpSide.path → ...er/paths/Obsolete/Blue3PickupAmpSide.path
diff --git a/...loy/pathplanner/paths/CloseAmpPickup.path → ...lanner/paths/Obsolete/CloseAmpPickup.path b/...loy/pathplanner/paths/CloseAmpPickup.path → ...lanner/paths/Obsolete/CloseAmpPickup.path
diff --git a/...anner/paths/CloseAmpPickupFromMiddle.path → ...paths/Obsolete/CloseAmpPickupFromMid.path b/...anner/paths/CloseAmpPickupFromMiddle.path → ...paths/Obsolete/CloseAmpPickupFromMid.path
diff --git a/...loy/pathplanner/paths/CloseMidPickup.path → ...lanner/paths/Obsolete/CloseMidPickup.path b/...loy/pathplanner/paths/CloseMidPickup.path → ...lanner/paths/Obsolete/CloseMidPickup.path
diff --git a/...er/paths/CloseMiddlePickupFromSource.path → ...Obsolete/CloseMiddlePickupFromSource.path b/...er/paths/CloseMiddlePickupFromSource.path → ...Obsolete/CloseMiddlePickupFromSource.path
diff --git a/.../pathplanner/paths/CloseSourcePickup.path → ...ner/paths/Obsolete/CloseSourcePickup.path b/.../pathplanner/paths/CloseSourcePickup.path → ...ner/paths/Obsolete/CloseSourcePickup.path
diff --git a/...thplanner/paths/testCollectNotepath1.path → .../paths/Obsolete/testCollectNotepath1.path b/...thplanner/paths/testCollectNotepath1.path → .../paths/Obsolete/testCollectNotepath1.path
diff --git a/...thplanner/paths/testCollectNotepath2.path → .../paths/Obsolete/testCollectNotepath2.path b/...thplanner/paths/testCollectNotepath2.path → .../paths/Obsolete/testCollectNotepath2.path
diff --git a/...in/deploy/pathplanner/paths/Infinity.path → ...oy/pathplanner/paths/Unused/Infinity.path b/...in/deploy/pathplanner/paths/Infinity.path → ...oy/pathplanner/paths/Unused/Infinity.path
diff --git a/...oy/pathplanner/paths/SuffleShootPath.path → ...planner/paths/Unused/SuffleShootPath.path b/...oy/pathplanner/paths/SuffleShootPath.path → ...planner/paths/Unused/SuffleShootPath.path
diff --git a/...y/pathplanner/paths/moveOneMeterPath.path → ...lanner/paths/Unused/moveOneMeterPath.path b/...y/pathplanner/paths/moveOneMeterPath.path → ...lanner/paths/Unused/moveOneMeterPath.path