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

Team334 · Apr 1, 2024 · ca979fb · ca979fb
2 parents 8619fdd + 5e1f7b0
commit ca979fb
Show file tree

Hide file tree

Showing 40 changed files with 2,367 additions and 13 deletions.
diff --git a/.pathplanner/settings.json b/.pathplanner/settings.json
@@ -1,18 +1,13 @@
 {
-  "robotWidth": 0.82,
-  "robotLength": 0.82,
+  "robotWidth": 0.8,
+  "robotLength": 0.8,
   "holonomicMode": true,
   "pathFolders": [
-    "bottom",
-    "center",
-    "MAIN",
-    "top"
+    "Continuations",
+    "Starting Paths"
   ],
   "autoFolders": [
-    "bottom",
-    "center",
-    "MAIN",
-    "top"
+    "New Autons"
   ],
   "defaultMaxVel": 4.0,
   "defaultMaxAccel": 3.0,

diff --git a/src/main/deploy/pathplanner/autos/1 Piece Auton Bottom Subwoofer.auto b/src/main/deploy/pathplanner/autos/1 Piece Auton Bottom Subwoofer.auto
@@ -0,0 +1,25 @@
+{
+  "version": 1.0,
+  "startingPose": {
+    "position": {
+      "x": 0.5985054075371309,
+      "y": 4.394832649314422
+    },
+    "rotation": 120.0
+  },
+  "command": {
+    "type": "sequential",
+    "data": {
+      "commands": [
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        }
+      ]
+    }
+  },
+  "folder": "New Autons",
+  "choreoAuto": false
+}
diff --git a/...ploy/pathplanner/autos/1 Piece Auton.auto → ...autos/1 Piece Auton Center Subwoofer.auto b/...ploy/pathplanner/autos/1 Piece Auton.auto → ...autos/1 Piece Auton Center Subwoofer.auto
@@ -2,8 +2,8 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 1.35,
-      "y": 5.55
+      "x": 1.2786251888293252,
+      "y": 5.582775200638121
     },
     "rotation": 180.0
   },
@@ -20,6 +20,6 @@
       ]
     }
   },
-  "folder": "center",
+  "folder": "New Autons",
   "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/1 Piece Auton Top Subwoofer.auto b/src/main/deploy/pathplanner/autos/1 Piece Auton Top Subwoofer.auto
@@ -0,0 +1,25 @@
+{
+  "version": 1.0,
+  "startingPose": {
+    "position": {
+      "x": 0.6075736712876936,
+      "y": 6.67
+    },
+    "rotation": -120.0
+  },
+  "command": {
+    "type": "sequential",
+    "data": {
+      "commands": [
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        }
+      ]
+    }
+  },
+  "folder": "New Autons",
+  "choreoAuto": false
+}
diff --git a/src/main/deploy/pathplanner/autos/2 Piece Auton from Bottom Subwoofer.auto b/src/main/deploy/pathplanner/autos/2 Piece Auton from Bottom Subwoofer.auto
@@ -0,0 +1,43 @@
+{
+  "version": 1.0,
+  "startingPose": {
+    "position": {
+      "x": 0.5985054075371309,
+      "y": 4.394832649314422
+    },
+    "rotation": 120.0
+  },
+  "command": {
+    "type": "sequential",
+    "data": {
+      "commands": [
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "Bottom Subwoofer to Bottom Note"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "actuateInFast"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        }
+      ]
+    }
+  },
+  "folder": "New Autons",
+  "choreoAuto": false
+}
diff --git a/src/main/deploy/pathplanner/autos/2 Piece Auton from Center Subwoofer.auto b/src/main/deploy/pathplanner/autos/2 Piece Auton from Center Subwoofer.auto
@@ -0,0 +1,43 @@
+{
+  "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"
+          }
+        }
+      ]
+    }
+  },
+  "folder": "New Autons",
+  "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
@@ -0,0 +1,43 @@
+{
+  "version": 1.0,
+  "startingPose": {
+    "position": {
+      "x": 0.5985054075371309,
+      "y": 4.394832649314422
+    },
+    "rotation": -120.0
+  },
+  "command": {
+    "type": "sequential",
+    "data": {
+      "commands": [
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "Top Subwoofer to Top Note"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "actuateInFast"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        }
+      ]
+    }
+  },
+  "folder": "New Autons",
+  "choreoAuto": false
+}
diff --git a/...anner/autos/3 Piece Auton from Bottom Subwoofer to Bottom Center Note to Middle Note.auto b/...anner/autos/3 Piece Auton from Bottom Subwoofer to Bottom Center Note to Middle Note.auto
@@ -0,0 +1,61 @@
+{
+  "version": 1.0,
+  "startingPose": {
+    "position": {
+      "x": 0.5985054075371309,
+      "y": 4.394832649314422
+    },
+    "rotation": 120.0
+  },
+  "command": {
+    "type": "sequential",
+    "data": {
+      "commands": [
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "Bottom Subwoofer to Bottom Note"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "actuateInFast"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "Bottom Note to Center Note"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "actuateInFast"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        }
+      ]
+    }
+  },
+  "folder": "New Autons",
+  "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
@@ -0,0 +1,61 @@
+{
+  "version": 1.0,
+  "startingPose": {
+    "position": {
+      "x": 1.3070140425995143,
+      "y": 5.55593454044051
+    },
+    "rotation": -120.0
+  },
+  "command": {
+    "type": "sequential",
+    "data": {
+      "commands": [
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "Center Subwoofer to Bottom Note"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "actuateInFast"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "Bottom Note to Center Note"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "actuateInFast"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "shoot"
+          }
+        }
+      ]
+    }
+  },
+  "folder": "New Autons",
+  "choreoAuto": false
+}