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

Team334 · Apr 7, 2024 · 30390e2 · 30390e2
2 parents 6efe7ea + dd65b51
commit 30390e2
Show file tree

Hide file tree

Showing 10 changed files with 112 additions and 16 deletions.
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
@@ -29,7 +29,19 @@
     }
   ],
   "rotationTargets": [],
-  "constraintZones": [],
+  "constraintZones": [
+    {
+      "name": "New Constraints Zone",
+      "minWaypointRelativePos": 0.85,
+      "maxWaypointRelativePos": 1.0,
+      "constraints": {
+        "maxVelocity": 4.6,
+        "maxAcceleration": 2.0,
+        "maxAngularVelocity": 450.0,
+        "maxAngularAcceleration": 360.0
+      }
+    }
+  ],
   "eventMarkers": [
     {
       "name": "New Event Marker",

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
@@ -29,7 +29,19 @@
     }
   ],
   "rotationTargets": [],
-  "constraintZones": [],
+  "constraintZones": [
+    {
+      "name": "New Constraints Zone",
+      "minWaypointRelativePos": 0.85,
+      "maxWaypointRelativePos": 1.0,
+      "constraints": {
+        "maxVelocity": 4.6,
+        "maxAcceleration": 2.0,
+        "maxAngularVelocity": 450.0,
+        "maxAngularAcceleration": 360.0
+      }
+    }
+  ],
   "eventMarkers": [
     {
       "name": "New Event Marker",

diff --git a/src/main/deploy/pathplanner/paths/Bottom Note to Subwoofer.path b/src/main/deploy/pathplanner/paths/Bottom Note to Subwoofer.path
@@ -20,8 +20,8 @@
         "y": 5.56
       },
       "prevControl": {
-        "x": 1.9251242788199865,
-        "y": 5.511956166769477
+        "x": 1.5770750270217908,
+        "y": 5.334391236319362
       },
       "nextControl": null,
       "isLocked": false,

diff --git a/src/main/deploy/pathplanner/paths/Center Note to Bottom Center Line Note.path b/src/main/deploy/pathplanner/paths/Center Note to Bottom Center Line Note.path
@@ -29,7 +29,19 @@
     }
   ],
   "rotationTargets": [],
-  "constraintZones": [],
+  "constraintZones": [
+    {
+      "name": "New Constraints Zone",
+      "minWaypointRelativePos": 0.85,
+      "maxWaypointRelativePos": 1.0,
+      "constraints": {
+        "maxVelocity": 4.6,
+        "maxAcceleration": 2.0,
+        "maxAngularVelocity": 450.0,
+        "maxAngularAcceleration": 360.0
+      }
+    }
+  ],
   "eventMarkers": [
     {
       "name": "New Event Marker",

diff --git a/src/main/deploy/pathplanner/paths/Center Note to Middle Bottom Center Line Note.path b/src/main/deploy/pathplanner/paths/Center Note to Middle Bottom Center Line Note.path
@@ -29,7 +29,19 @@
     }
   ],
   "rotationTargets": [],
-  "constraintZones": [],
+  "constraintZones": [
+    {
+      "name": "New Constraints Zone",
+      "minWaypointRelativePos": 0.85,
+      "maxWaypointRelativePos": 1.0,
+      "constraints": {
+        "maxVelocity": 4.6,
+        "maxAcceleration": 2.0,
+        "maxAngularVelocity": 450.0,
+        "maxAngularAcceleration": 360.0
+      }
+    }
+  ],
   "eventMarkers": [
     {
       "name": "New Event Marker",

diff --git a/src/main/deploy/pathplanner/paths/Center Note to Middle Top Center Line Note.path b/src/main/deploy/pathplanner/paths/Center Note to Middle Top Center Line Note.path
@@ -29,7 +29,19 @@
     }
   ],
   "rotationTargets": [],
-  "constraintZones": [],
+  "constraintZones": [
+    {
+      "name": "New Constraints Zone",
+      "minWaypointRelativePos": 0.85,
+      "maxWaypointRelativePos": 1.0,
+      "constraints": {
+        "maxVelocity": 4.6,
+        "maxAcceleration": 2.0,
+        "maxAngularVelocity": 450.0,
+        "maxAngularAcceleration": 360.0
+      }
+    }
+  ],
   "eventMarkers": [
     {
       "name": "New Event Marker",

diff --git a/src/main/deploy/pathplanner/paths/Center Note to Top Center Line Note.path b/src/main/deploy/pathplanner/paths/Center Note to Top Center Line Note.path
@@ -29,7 +29,19 @@
     }
   ],
   "rotationTargets": [],
-  "constraintZones": [],
+  "constraintZones": [
+    {
+      "name": "New Constraints Zone",
+      "minWaypointRelativePos": 0.85,
+      "maxWaypointRelativePos": 1.0,
+      "constraints": {
+        "maxVelocity": 4.6,
+        "maxAcceleration": 2.0,
+        "maxAngularVelocity": 450.0,
+        "maxAngularAcceleration": 360.0
+      }
+    }
+  ],
   "eventMarkers": [
     {
       "name": "New Event Marker",

diff --git a/src/main/deploy/pathplanner/paths/Shooting at the Bottom to Middle Center Line Note.path b/src/main/deploy/pathplanner/paths/Shooting at the Bottom to Middle Center Line Note.path
@@ -8,8 +8,8 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 3.1980841104539355,
-        "y": 1.627199825828224
+        "x": 3.4827073513397884,
+        "y": 2.3961502633561444
       },
       "isLocked": false,
       "linkedName": null
@@ -20,8 +20,8 @@
         "y": 2.45
       },
       "prevControl": {
-        "x": 3.4033165209187564,
-        "y": 0.5570593998330865
+        "x": 6.017292216196237,
+        "y": 0.23705945255250263
       },
       "nextControl": null,
       "isLocked": false,
@@ -41,8 +41,8 @@
       "minWaypointRelativePos": 0.85,
       "maxWaypointRelativePos": 1.0,
       "constraints": {
-        "maxVelocity": 3.34,
-        "maxAcceleration": 3.0,
+        "maxVelocity": 4.6,
+        "maxAcceleration": 2.0,
         "maxAngularVelocity": 450.0,
         "maxAngularAcceleration": 360.0
       }

diff --git a/src/main/deploy/pathplanner/paths/Top Note to Middle Top Center Line Note.path b/src/main/deploy/pathplanner/paths/Top Note to Middle Top Center Line Note.path
@@ -29,7 +29,19 @@
     }
   ],
   "rotationTargets": [],
-  "constraintZones": [],
+  "constraintZones": [
+    {
+      "name": "New Constraints Zone",
+      "minWaypointRelativePos": 0.85,
+      "maxWaypointRelativePos": 1.0,
+      "constraints": {
+        "maxVelocity": 4.6,
+        "maxAcceleration": 2.0,
+        "maxAngularVelocity": 450.0,
+        "maxAngularAcceleration": 360.0
+      }
+    }
+  ],
   "eventMarkers": [
     {
       "name": "New Event Marker",

diff --git a/src/main/deploy/pathplanner/paths/Top Note to Top Center Line Note.path b/src/main/deploy/pathplanner/paths/Top Note to Top Center Line Note.path
@@ -29,7 +29,19 @@
     }
   ],
   "rotationTargets": [],
-  "constraintZones": [],
+  "constraintZones": [
+    {
+      "name": "New Constraints Zone",
+      "minWaypointRelativePos": 0.85,
+      "maxWaypointRelativePos": 1.0,
+      "constraints": {
+        "maxVelocity": 4.6,
+        "maxAcceleration": 2.0,
+        "maxAngularVelocity": 450.0,
+        "maxAngularAcceleration": 360.0
+      }
+    }
+  ],
   "eventMarkers": [
     {
       "name": "New Event Marker",