Skip to content

Commit

Permalink
Merge pull request #55 from TotalTaxAmount/main
Browse files Browse the repository at this point in the history 
All code after 1619
  • Loading branch information
@zaneal
zaneal authored Mar 17, 2024
2 parents beaa4b6 + 2475436 commit 16cfd17
Show file tree
Hide file tree
Showing 51 changed files with 532 additions and 295 deletions.
6 changes: 3 additions & 3 deletions .pathplanner/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"Source"
],
"defaultMaxVel": 1.0,
"defaultMaxAccel": 0.5,
"defaultMaxAngVel": 540.0,
"defaultMaxAngAccel": 720.0,
"defaultMaxAccel": 3.0,
"defaultMaxAngVel": 360.0,
"defaultMaxAngAccel": 180.0,
"maxModuleSpeed": 7.0
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/Amp2.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/Amp3.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -89,7 +89,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/autos/Amp4.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -89,7 +89,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -127,7 +127,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/Basic Auto.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.51,
"y": 2.03
"x": 0.0,
"y": 0.0
},
"rotation": 0
},
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/Center2.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/Center3.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -89,7 +89,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/autos/Center4.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -89,7 +89,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -127,7 +127,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/autos/Center5.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -75,7 +75,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -106,7 +106,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -137,7 +137,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down
10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/autos/Center6.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -75,7 +75,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -106,7 +106,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -137,7 +137,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -168,7 +168,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down
10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/autos/CenterFront.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 1.3684259729630575,
"y": 5.486344532874251
"x": 1.3164584504524461,
"y": 5.487694894228651
},
"rotation": 0
},
Expand Down Expand Up @@ -44,7 +44,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "ShortIntakeCommand"
}
},
{
Expand Down Expand Up @@ -75,7 +75,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "MediumIntakeCommand"
}
},
{
Expand Down Expand Up @@ -106,7 +106,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/Source2.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/Source3.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -89,7 +89,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/autos/Source4.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -89,7 +89,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down Expand Up @@ -127,7 +127,7 @@
{
"type": "named",
"data": {
"name": "IntakeCommand"
"name": "LongIntakeCommand"
}
},
{
Expand Down
26 changes: 10 additions & 16 deletions src/main/deploy/pathplanner/paths/AmpShoot.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,31 @@
},
{
"anchor": {
"x": 2.4363352430408565,
"y": 5.54353168891523
"x": 2.1764895688508483,
"y": 5.557979166945176
},
"prevControl": {
"x": 7.526759423889221,
"y": 8.617129488518252
"x": 7.787513187416726,
"y": 7.656538344189628
},
"nextControl": null,
"isLocked": false,
"linkedName": null
}
],
"rotationTargets": [
{
"waypointRelativePos": 0.95,
"rotationDegrees": 0,
"rotateFast": true
}
],
"rotationTargets": [],
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 0.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
"maxAcceleration": 3.0,
"maxAngularVelocity": 360.0,
"maxAngularAcceleration": 180.0
},
"goalEndState": {
"velocity": 0,
"rotation": 1.8248185957352634,
"rotateFast": false
"rotation": 0.0,
"rotateFast": true
},
"reversed": false,
"folder": "Shoot",
Expand Down
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/paths/Back1.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 0.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
"maxAcceleration": 3.0,
"maxAngularVelocity": 360.0,
"maxAngularAcceleration": 180.0
},
"goalEndState": {
"velocity": 0,
Expand Down
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/paths/Back2.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 0.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
"maxAcceleration": 3.0,
"maxAngularVelocity": 360.0,
"maxAngularAcceleration": 180.0
},
"goalEndState": {
"velocity": 0,
Expand Down
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/paths/Back3.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 0.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
"maxAcceleration": 3.0,
"maxAngularVelocity": 360.0,
"maxAngularAcceleration": 180.0
},
"goalEndState": {
"velocity": 0,
Expand Down
Loading

0 comments on commit 16cfd17

Please sign in to comment.