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

Team334 · Apr 3, 2024 · 850debd · 850debd
2 parents 2ee7f93 + b2d7989
commit 850debd
Show file tree

Hide file tree

Showing 40 changed files with 149 additions and 63 deletions.
diff --git a/src/main/deploy/pathplanner/autos/2 Piece Auton C.auto b/src/main/deploy/pathplanner/autos/2 Piece Auton C.auto
@@ -38,6 +38,6 @@
       ]
     }
   },
-  "folder": "center",
+  "folder": null,
   "choreoAuto": false
 }
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
@@ -38,6 +38,6 @@
       ]
     }
   },
-  "folder": "MAIN",
+  "folder": null,
   "choreoAuto": false
 }
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
@@ -38,6 +38,6 @@
       ]
     }
   },
-  "folder": "MAIN",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/2 Piece Auton S.auto b/src/main/deploy/pathplanner/autos/2 Piece Auton S.auto
@@ -38,6 +38,6 @@
       ]
     }
   },
-  "folder": "center",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/2 Piece Auton from Top Subwoofer.auto b/src/main/deploy/pathplanner/autos/2 Piece Auton from Top Subwoofer.auto
@@ -2,8 +2,8 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 0.5985054075371309,
-      "y": 4.394832649314422
+      "x": 0.6075736712876936,
+      "y": 6.67
     },
     "rotation": -120.0
   },

diff --git a/src/main/deploy/pathplanner/autos/3 Piece Auton C.auto b/src/main/deploy/pathplanner/autos/3 Piece Auton C.auto
@@ -56,6 +56,6 @@
       ]
     }
   },
-  "folder": "center",
+  "folder": null,
   "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
@@ -38,7 +38,7 @@
         {
           "type": "path",
           "data": {
-            "pathName": "l get top c"
+            "pathName": "get top note c"
           }
         },
         {
@@ -56,6 +56,6 @@
       ]
     }
   },
-  "folder": "MAIN",
+  "folder": null,
   "choreoAuto": false
 }
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
@@ -56,6 +56,6 @@
       ]
     }
   },
-  "folder": "MAIN",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/3 Piece Auton S.auto b/src/main/deploy/pathplanner/autos/3 Piece Auton S.auto
@@ -50,6 +50,6 @@
       ]
     }
   },
-  "folder": "center",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/.../pathplanner/autos/3 Piece Auton from Center Subwoofer to Bottom Note to Center Note.auto b/.../pathplanner/autos/3 Piece Auton from Center Subwoofer to Bottom Note to Center Note.auto
@@ -5,7 +5,7 @@
       "x": 1.3070140425995143,
       "y": 5.55593454044051
     },
-    "rotation": -120.0
+    "rotation": 180.0
   },
   "command": {
     "type": "sequential",

diff --git a/...loy/pathplanner/autos/3 Piece Auton from Center Subwoofer to Center Note to Top Note.auto b/...loy/pathplanner/autos/3 Piece Auton from Center Subwoofer to Center Note to Top Note.auto
@@ -5,7 +5,7 @@
       "x": 1.3070140425995143,
       "y": 5.55593454044051
     },
-    "rotation": -120.0
+    "rotation": 180.0
   },
   "command": {
     "type": "sequential",

diff --git a/...loy/pathplanner/autos/3 Piece Auton from Center Subwoofer to Top Note to Center Note.auto b/...loy/pathplanner/autos/3 Piece Auton from Center Subwoofer to Top Note to Center Note.auto
@@ -5,7 +5,7 @@
       "x": 1.3070140425995143,
       "y": 5.55593454044051
     },
-    "rotation": -120.0
+    "rotation": 180.0
   },
   "command": {
     "type": "sequential",

diff --git a/src/main/deploy/pathplanner/autos/4 Piece Auton (Center) C.auto b/src/main/deploy/pathplanner/autos/4 Piece Auton (Center) C.auto
@@ -74,6 +74,6 @@
       ]
     }
   },
-  "folder": "center",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/4 Piece Auton C.auto b/src/main/deploy/pathplanner/autos/4 Piece Auton C.auto
@@ -74,6 +74,6 @@
       ]
     }
   },
-  "folder": "center",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/4 Piece Auton Line C.auto b/src/main/deploy/pathplanner/autos/4 Piece Auton Line C.auto
@@ -20,7 +20,7 @@
         {
           "type": "path",
           "data": {
-            "pathName": "c get mid c"
+            "pathName": "Center Subwoofer to Center Note"
           }
         },
         {
@@ -38,7 +38,7 @@
         {
           "type": "path",
           "data": {
-            "pathName": "l get top c"
+            "pathName": "Center Note to Top Note"
           }
         },
         {
@@ -74,6 +74,6 @@
       ]
     }
   },
-  "folder": "MAIN",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/4 Piece Auton Line S.auto b/src/main/deploy/pathplanner/autos/4 Piece Auton Line S.auto
@@ -74,6 +74,6 @@
       ]
     }
   },
-  "folder": "MAIN",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/4 Piece Auton S.auto b/src/main/deploy/pathplanner/autos/4 Piece Auton S.auto
@@ -74,6 +74,6 @@
       ]
     }
   },
-  "folder": "center",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/...Piece Auton from Center Subwoofer to Center Note to Top Note to Top Center Line Note.auto b/...Piece Auton from Center Subwoofer to Center Note to Top Note to Top Center Line Note.auto
@@ -0,0 +1,85 @@
+{
+  "version": 1.0,
+  "startingPose": {
+    "position": {
+      "x": 1.3070140425995143,
+      "y": 5.55593454044051
+    },
+    "rotation": 180.0
+  },
+  "command": {
+    "type": "sequential",
+    "data": {
+      "commands": [
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "Center Subwoofer to Center Note"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "actuateInFast"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "Center Note to Top Note"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "actuateInFast"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "Top Note to Top Center Line Note"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "actuateIn"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "Top Center Line Note to Shooting at the Center"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        }
+      ]
+    }
+  },
+  "folder": "New Autons",
+  "choreoAuto": false
+}
diff --git a/src/main/deploy/pathplanner/autos/5 Piece Auton S.auto b/src/main/deploy/pathplanner/autos/5 Piece Auton S.auto
@@ -56,6 +56,6 @@
       ]
     }
   },
-  "folder": "center",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/B 1 Piece Auton.auto b/src/main/deploy/pathplanner/autos/B 1 Piece Auton.auto
@@ -20,6 +20,6 @@
       ]
     }
   },
-  "folder": "bottom",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/B 2 Piece Auton.auto b/src/main/deploy/pathplanner/autos/B 2 Piece Auton.auto
@@ -38,6 +38,6 @@
       ]
     }
   },
-  "folder": "bottom",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/B 3 Piece Auton.auto b/src/main/deploy/pathplanner/autos/B 3 Piece Auton.auto
@@ -56,6 +56,6 @@
       ]
     }
   },
-  "folder": "bottom",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/T 1 Piece Auton.auto b/src/main/deploy/pathplanner/autos/T 1 Piece Auton.auto
@@ -20,6 +20,6 @@
       ]
     }
   },
-  "folder": "top",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/T 2 Piece Auton.auto b/src/main/deploy/pathplanner/autos/T 2 Piece Auton.auto
@@ -38,6 +38,6 @@
       ]
     }
   },
-  "folder": "top",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/T 3 Piece Auton.auto b/src/main/deploy/pathplanner/autos/T 3 Piece Auton.auto
@@ -56,6 +56,6 @@
       ]
     }
   },
-  "folder": "top",
+  "folder": null,
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/paths/Bottom Note to Bottom Center Line Note.path b/src/main/deploy/pathplanner/paths/Bottom Note to Bottom Center Line Note.path
@@ -8,8 +8,8 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.0065772763124474,
-        "y": 3.44266495550535
+        "x": 1.9713437837772385,
+        "y": 2.227177939032382
       },
       "isLocked": false,
       "linkedName": null
@@ -20,8 +20,8 @@
         "y": 0.7765954128399487
       },
       "prevControl": {
-        "x": 6.82840260417363,
-        "y": 0.7403223578376983
+        "x": 6.721343567545252,
+        "y": 0.9411108039015167
       },
       "nextControl": null,
       "isLocked": false,

diff --git a/src/main/deploy/pathplanner/paths/Bottom Note to Center Note.path b/src/main/deploy/pathplanner/paths/Bottom Note to Center Note.path
@@ -8,8 +8,8 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.457499476402462,
-        "y": 4.53085660557286
+        "x": 1.839920864858756,
+        "y": 4.639727236321669
       },
       "isLocked": false,
       "linkedName": null
@@ -20,8 +20,8 @@
         "y": 5.56
       },
       "prevControl": {
-        "x": 2.1145198276361468,
-        "y": 5.061245493719057
+        "x": 1.952569081074598,
+        "y": 5.19358096604956
       },
       "nextControl": null,
       "isLocked": false,

diff --git a/src/main/deploy/pathplanner/paths/Bottom Note to Middle Bottom Center Line Note.path b/src/main/deploy/pathplanner/paths/Bottom Note to Middle Bottom Center Line Note.path
@@ -8,8 +8,8 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.0065772763124474,
-        "y": 3.44266495550535
+        "x": 2.093379351344401,
+        "y": 2.8749051822734737
       },
       "isLocked": false,
       "linkedName": null

diff --git a/src/main/deploy/pathplanner/paths/Bottom Subwoofer to Bottom Note.path b/src/main/deploy/pathplanner/paths/Bottom Subwoofer to Bottom Note.path
@@ -8,8 +8,8 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.097142509470058,
-        "y": 4.394832649314422
+        "x": 1.1358695135097423,
+        "y": 4.142197614701699
       },
       "isLocked": false,
       "linkedName": null