Skip to content

Commit

Permalink
Merge branch 'main' into align-to-reefbranch
Browse files Browse the repository at this point in the history
  • Loading branch information
@msoucy
msoucy committed Feb 22, 2025
2 parents 3bbdc69 + 8325974 commit 88315b0
Show file tree
Hide file tree
Showing 49 changed files with 177 additions and 121 deletions.
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/1 - A go to top source.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/1 - B go to top source.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/1 - Destage algae.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/1 - score coral.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Backup I.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Backup.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/From left 1 to source.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/ReefA to StationL.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/ReefA to StationR.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/ReefB to StationL.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/ReefB to StationR.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/ReefC to StationR.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/ReefD to StationR.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/ReefE to StationR.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/ReefF to StationR.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/ReefI to StationL.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/ReefJ to StationL.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/ReefK to StationL.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/ReefL to StationL.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/paths/Start1 to ReefI.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
},
{
"anchor": {
"x": 5.307307692307692,
"y": 5.170576923076924
"x": 5.314857954545454,
"y": 5.116889204545455
},
"prevControl": {
"x": 5.8622435897435885,
"y": 5.346282051282053
"x": 5.869793851981351,
"y": 5.292594332750584
},
"nextControl": null,
"isLocked": false,
Expand All @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Start1 to ReefJ.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Start1 to ReefK.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Start1 to ReefL.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Start2 to ReefG .path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Start2 to ReefH.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Start3 to ReefC.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Start3 to ReefD.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Start3 to ReefE.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
14 changes: 7 additions & 7 deletions src/main/deploy/pathplanner/paths/Start3 to ReefF.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
},
"prevControl": null,
"nextControl": {
"x": 6.431506849315069,
"y": 2.7927108579206186
"x": 6.308397435897436,
"y": 2.3943589743589744
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 5.296987179487179,
"y": 2.88974358974359
"x": 5.369230769230769,
"y": 2.9826282051282056
},
"prevControl": {
"x": 5.79192724798033,
"y": 2.423386569195644
"x": 5.86417083772392,
"y": 2.5162711845802597
},
"nextControl": null,
"isLocked": false,
Expand All @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/StationL To ReefA.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/StationL To ReefB.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/StationL To ReefI.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/StationL To ReefJ.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/StationL To ReefK.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/StationL To ReefL.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/StationR to ReefA.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/StationR to ReefB.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/StationR to ReefC.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/StationR to ReefD.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAcceleration": 6.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand Down
Loading

0 comments on commit 88315b0

Please sign in to comment.