Skip to content

Commit

Permalink
April 11 (#106)
Browse files Browse the repository at this point in the history
* Remove led attention in far half of field

* Make swerve climb its own command

* Fix reroute 5 piece

* Reroute auto changes

* Climb alignment

* Add reroutable top ferry auton

* Reroute top ferry auton

* Undo without moving shoot

* Sub in more accurate shoot command for HGF autons

---------

Co-authored-by: Prog694 <[email protected]>
Co-authored-by: Ivan Chen <[email protected]>
  • Loading branch information
3 people authored Apr 15, 2024
1 parent 14e516c commit 82897e1
Show file tree
Hide file tree
Showing 24 changed files with 558 additions and 78 deletions.
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/A to E.path
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
},
{
"anchor": {
"x": 8.17,
"x": 8.07,
"y": 5.84
},
"prevControl": {
"x": 7.01740860685425,
"x": 6.91740860685425,
"y": 6.462229512977543
},
"nextControl": null,
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/D to Ferry Shot.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"waypoints": [
{
"anchor": {
"x": 8.0,
"x": 7.7,
"y": 7.529999999999999
},
"prevControl": null,
"nextControl": {
"x": 7.0823974120170465,
"x": 6.782397412017047,
"y": 7.253301738161635
},
"isLocked": false,
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/E to Ferry Shot.path
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
},
{
"anchor": {
"x": 5.3,
"x": 5.15,
"y": 6.563657142562062
},
"prevControl": {
"x": 5.567533940069292,
"x": 5.417533940069292,
"y": 6.480854711709423
},
"nextControl": null,
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/E to Shoot.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"waypoints": [
{
"anchor": {
"x": 8.17,
"x": 8.07,
"y": 5.84
},
"prevControl": null,
"nextControl": {
"x": 6.661102338686158,
"x": 6.561102338686158,
"y": 6.648577691229455
},
"isLocked": false,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/F to Shoot (HGF).path
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"prevControl": null,
"nextControl": {
"x": 4.984199142187458,
"y": 5.437781815734572
"y": 5.437781815734571
},
"isLocked": false,
"linkedName": "F"
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Ferry Shot to F.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"waypoints": [
{
"anchor": {
"x": 5.3,
"x": 5.15,
"y": 6.563657142562062
},
"prevControl": null,
"nextControl": {
"x": 6.5806314292272345,
"x": 6.430631429227235,
"y": 6.476519652113379
},
"isLocked": false,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/GShoot to F (HGF).path
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"prevControl": {
"x": 5.819658184786454,
"y": 5.066378211460127
"y": 5.066378211460126
},
"nextControl": null,
"isLocked": false,
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/NTF D To E.path
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
},
{
"anchor": {
"x": 8.17,
"x": 8.07,
"y": 5.84
},
"prevControl": {
"x": 6.920699524719652,
"x": 6.820699524719652,
"y": 5.881812946132679
},
"nextControl": null,
Expand Down
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/paths/NTF E To F.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"waypoints": [
{
"anchor": {
"x": 8.17,
"x": 8.07,
"y": 5.84
},
"prevControl": null,
"nextControl": {
"x": 6.621010550777611,
"x": 6.5210105507776115,
"y": 6.341337932241838
},
"isLocked": false,
Expand Down Expand Up @@ -37,7 +37,7 @@
},
"prevControl": {
"x": 7.424255376791419,
"y": 4.810087379302906
"y": 4.810087379302905
},
"nextControl": null,
"isLocked": false,
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/paths/NTF Start To D.path
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
},
{
"anchor": {
"x": 8.0,
"x": 7.7,
"y": 7.529999999999999
},
"prevControl": {
"x": 6.222230165687515,
"x": 5.922230165687515,
"y": 7.685534706860702
},
"nextControl": null,
Expand Down Expand Up @@ -67,7 +67,7 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 4.5,
"maxAcceleration": 4.0,
"maxAcceleration": 3.8,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand All @@ -82,5 +82,5 @@
"rotation": 47.48005904226506,
"velocity": 0
},
"useDefaultConstraints": true
"useDefaultConstraints": false
}
52 changes: 52 additions & 0 deletions src/main/deploy/pathplanner/paths/Rerouted D To E.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": 1.0,
"waypoints": [
{
"anchor": {
"x": 8.2,
"y": 7.431149973519566
},
"prevControl": null,
"nextControl": {
"x": 8.2,
"y": 6.931149973519566
},
"isLocked": false,
"linkedName": "D"
},
{
"anchor": {
"x": 8.07,
"y": 5.84
},
"prevControl": {
"x": 8.07,
"y": 6.34
},
"nextControl": null,
"isLocked": false,
"linkedName": "E"
}
],
"rotationTargets": [],
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 4.5,
"maxAcceleration": 4.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
"goalEndState": {
"velocity": 0,
"rotation": -90.0,
"rotateFast": true
},
"reversed": false,
"folder": "ABCDE",
"previewStartingState": {
"rotation": 0,
"velocity": 0
},
"useDefaultConstraints": true
}
52 changes: 52 additions & 0 deletions src/main/deploy/pathplanner/paths/Rerouted E To D.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": 1.0,
"waypoints": [
{
"anchor": {
"x": 8.07,
"y": 5.84
},
"prevControl": null,
"nextControl": {
"x": 8.076569848142244,
"y": 6.3941167539916925
},
"isLocked": false,
"linkedName": "E"
},
{
"anchor": {
"x": 8.2,
"y": 7.431149973519566
},
"prevControl": {
"x": 8.199991521233805,
"y": 6.827417706185608
},
"nextControl": null,
"isLocked": false,
"linkedName": "D"
}
],
"rotationTargets": [],
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 4.5,
"maxAcceleration": 4.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
"goalEndState": {
"velocity": 0,
"rotation": 91.13644188312996,
"rotateFast": true
},
"reversed": false,
"folder": "ABCDE",
"previewStartingState": {
"rotation": 0,
"velocity": 0
},
"useDefaultConstraints": true
}
10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/paths/Rerouted E To F.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 8.17,
"x": 8.07,
"y": 5.84
},
"prevControl": null,
"nextControl": {
"x": 8.17,
"y": 4.84
"x": 8.07,
"y": 5.34
},
"isLocked": false,
"linkedName": "E"
Expand All @@ -21,7 +21,7 @@
},
"prevControl": {
"x": 8.153314996088682,
"y": 4.800600193792981
"y": 4.300600193792981
},
"nextControl": null,
"isLocked": false,
Expand All @@ -43,7 +43,7 @@
"rotateFast": true
},
"reversed": false,
"folder": "ABCDE",
"folder": "Top Ferry",
"previewStartingState": {
"rotation": 0,
"velocity": 0
Expand Down
52 changes: 52 additions & 0 deletions src/main/deploy/pathplanner/paths/Rerouted E to Ferry Shot.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": 1.0,
"waypoints": [
{
"anchor": {
"x": 8.37,
"y": 5.34
},
"prevControl": null,
"nextControl": {
"x": 8.101123246690936,
"y": 5.352924298441191
},
"isLocked": false,
"linkedName": "E Top Ferry"
},
{
"anchor": {
"x": 5.15,
"y": 6.563657142562062
},
"prevControl": {
"x": 5.417533940069292,
"y": 6.480854711709423
},
"nextControl": null,
"isLocked": false,
"linkedName": "Ferry Shot E"
}
],
"rotationTargets": [],
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.0,
"maxAcceleration": 4.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
"goalEndState": {
"velocity": 0,
"rotation": -4.860211087167981,
"rotateFast": false
},
"reversed": false,
"folder": "Top Ferry",
"previewStartingState": {
"rotation": 0,
"velocity": 0
},
"useDefaultConstraints": true
}
Loading

0 comments on commit 82897e1

Please sign in to comment.