Skip to content

Commit

Permalink
change angular accel
Browse files Browse the repository at this point in the history
  • Loading branch information
TapChap committed Mar 20, 2024
1 parent 0607802 commit 9e6c375
Show file tree
Hide file tree
Showing 21 changed files with 280 additions and 125 deletions.
9 changes: 4 additions & 5 deletions .pathplanner/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
"holonomicMode": true,
"pathFolders": [
"Auto",
"1234",
"Teleop"
],
"autoFolders": [],
"defaultMaxVel": 5.3,
"defaultMaxAccel": 2.5,
"defaultMaxAngVel": 180.0,
"defaultMaxAngAccel": 180.0,
"defaultMaxVel": 5.5,
"defaultMaxAccel": 3.0,
"defaultMaxAngVel": 290.0,
"defaultMaxAngAccel": 250.0,
"maxModuleSpeed": 5.88
}
24 changes: 12 additions & 12 deletions src/main/deploy/pathplanner/paths/New Path.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"waypoints": [
{
"anchor": {
"x": 2.892772708625951,
"y": 6.995662452864436
"x": 15.8,
"y": 4.48
},
"prevControl": null,
"nextControl": {
"x": 3.892772708625951,
"y": 6.995662452864436
"x": 16.8,
"y": 4.48
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 8.289990426134699,
"y": 7.439674879349759
"x": 4.0,
"y": 6.0
},
"prevControl": {
"x": 7.289990426134699,
"y": 7.439674879349759
"x": 3.0,
"y": 6.0
},
"nextControl": null,
"isLocked": false,
Expand All @@ -32,10 +32,10 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.3,
"maxAcceleration": 2.5,
"maxAngularVelocity": 180.0,
"maxAngularAcceleration": 180.0
"maxVelocity": 5.5,
"maxAcceleration": 3.0,
"maxAngularVelocity": 290.0,
"maxAngularAcceleration": 250.0
},
"goalEndState": {
"velocity": 0,
Expand Down
16 changes: 8 additions & 8 deletions src/main/deploy/pathplanner/paths/Note1ToPose1.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 2.537562767433229,
"y": 6.798323596647194
"x": 2.5079619390008028,
"y": 6.916726910376898
},
"prevControl": null,
"nextControl": {
"x": 2.109430800058183,
"y": 6.62080546383315
"x": 2.079829971625757,
"y": 6.739208777562855
},
"isLocked": false,
"linkedName": "note1"
Expand All @@ -32,10 +32,10 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.3,
"maxAcceleration": 2.5,
"maxAngularVelocity": 180.0,
"maxAngularAcceleration": 180.0
"maxVelocity": 5.5,
"maxAcceleration": 3.0,
"maxAngularVelocity": 290.0,
"maxAngularAcceleration": 250.0
},
"goalEndState": {
"velocity": 0,
Expand Down
20 changes: 10 additions & 10 deletions src/main/deploy/pathplanner/paths/Note1ToPose2.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"waypoints": [
{
"anchor": {
"x": 2.537562767433229,
"y": 6.798323596647194
"x": 2.5079619390008028,
"y": 6.916726910376898
},
"prevControl": null,
"nextControl": {
"x": 2.2514214259197765,
"y": 6.255641742052716
"x": 2.2218205974873504,
"y": 6.37404505578242
},
"isLocked": false,
"linkedName": "note1"
},
{
"anchor": {
"x": 1.3,
"y": 5.57
"y": 5.5665622442356
},
"prevControl": {
"x": 2.0714125684661635,
"y": 5.854534842573959
"y": 5.851097086809559
},
"nextControl": null,
"isLocked": false,
Expand All @@ -32,10 +32,10 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.3,
"maxAcceleration": 2.5,
"maxAngularVelocity": 180.0,
"maxAngularAcceleration": 180.0
"maxVelocity": 5.5,
"maxAcceleration": 3.0,
"maxAngularVelocity": 290.0,
"maxAngularAcceleration": 250.0
},
"goalEndState": {
"velocity": 0,
Expand Down
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Note2ToPose2.path
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
{
"anchor": {
"x": 1.3,
"y": 5.57
"y": 5.5665622442356
},
"prevControl": {
"x": 1.8473005390455222,
"y": 5.58831625885474
"y": 5.58487850309034
},
"nextControl": null,
"isLocked": false,
Expand All @@ -32,10 +32,10 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.3,
"maxAcceleration": 2.5,
"maxAngularVelocity": 180.0,
"maxAngularAcceleration": 180.0
"maxVelocity": 5.5,
"maxAcceleration": 3.0,
"maxAngularVelocity": 290.0,
"maxAngularAcceleration": 250.0
},
"goalEndState": {
"velocity": 0,
Expand Down
16 changes: 8 additions & 8 deletions src/main/deploy/pathplanner/paths/Note3ToPose2.path
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
{
"anchor": {
"x": 2.596764424298081,
"y": 4.33
"y": 4.430257322053106
},
"prevControl": null,
"nextControl": {
"x": 2.359957796838672,
"y": 4.793746312108008
"y": 4.894003634161114
},
"isLocked": false,
"linkedName": "note3"
},
{
"anchor": {
"x": 1.3,
"y": 5.57
"y": 5.5665622442356
},
"prevControl": {
"x": 1.95300925473646,
"y": 5.46972407295242
"y": 5.46628631718802
},
"nextControl": null,
"isLocked": false,
Expand All @@ -38,10 +38,10 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.3,
"maxAcceleration": 2.5,
"maxAngularVelocity": 180.0,
"maxAngularAcceleration": 180.0
"maxVelocity": 5.5,
"maxAcceleration": 3.0,
"maxAngularVelocity": 290.0,
"maxAngularAcceleration": 250.0
},
"goalEndState": {
"velocity": 0,
Expand Down
16 changes: 8 additions & 8 deletions src/main/deploy/pathplanner/paths/Note4ToAmp.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 7.934780484945588,
"y": 7.3114046228092455
"x": 7.9446474277563945,
"y": 7.419940993728142
},
"prevControl": null,
"nextControl": {
"x": 7.3032961450538325,
"y": 6.571383911998592
"x": 7.313163087864639,
"y": 6.679920282917489
},
"isLocked": false,
"linkedName": "note4"
Expand All @@ -32,10 +32,10 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.3,
"maxAcceleration": 2.5,
"maxAngularVelocity": 180.0,
"maxAngularAcceleration": 180.0
"maxVelocity": 5.5,
"maxAcceleration": 3.0,
"maxAngularVelocity": 290.0,
"maxAngularAcceleration": 250.0
},
"goalEndState": {
"velocity": 0,
Expand Down
16 changes: 8 additions & 8 deletions src/main/deploy/pathplanner/paths/Note4ToPose1.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 7.934780484945588,
"y": 7.3114046228092455
"x": 7.9446474277563945,
"y": 7.419940993728142
},
"prevControl": null,
"nextControl": {
"x": 6.060061350891935,
"y": 7.676481506809167
"x": 6.069928293702742,
"y": 7.785017877728063
},
"isLocked": false,
"linkedName": "note4"
Expand All @@ -32,10 +32,10 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.3,
"maxAcceleration": 2.5,
"maxAngularVelocity": 180.0,
"maxAngularAcceleration": 180.0
"maxVelocity": 5.5,
"maxAcceleration": 3.0,
"maxAngularVelocity": 290.0,
"maxAngularAcceleration": 250.0
},
"goalEndState": {
"velocity": 0,
Expand Down
52 changes: 52 additions & 0 deletions src/main/deploy/pathplanner/paths/Note4ToPose2.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": 1.0,
"waypoints": [
{
"anchor": {
"x": 7.9446474277563945,
"y": 7.419940993728142
},
"prevControl": null,
"nextControl": {
"x": 5.783786952189291,
"y": 6.748988882593149
},
"isLocked": false,
"linkedName": "note4"
},
{
"anchor": {
"x": 1.3,
"y": 5.5665622442356
},
"prevControl": {
"x": 1.738340399757724,
"y": 6.29510951329595
},
"nextControl": null,
"isLocked": false,
"linkedName": "pose2"
}
],
"rotationTargets": [],
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.5,
"maxAcceleration": 3.0,
"maxAngularVelocity": 290.0,
"maxAngularAcceleration": 250.0
},
"goalEndState": {
"velocity": 0,
"rotation": 0,
"rotateFast": false
},
"reversed": false,
"folder": "Auto",
"previewStartingState": {
"rotation": 0,
"velocity": 0
},
"useDefaultConstraints": true
}
52 changes: 52 additions & 0 deletions src/main/deploy/pathplanner/paths/PID Test.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": 1.0,
"waypoints": [
{
"anchor": {
"x": 0.0,
"y": 0.0
},
"prevControl": null,
"nextControl": {
"x": 1.0,
"y": 0.0
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 3.0,
"y": 0.0
},
"prevControl": {
"x": 2.0,
"y": 0.0
},
"nextControl": null,
"isLocked": false,
"linkedName": null
}
],
"rotationTargets": [],
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.5,
"maxAcceleration": 3.0,
"maxAngularVelocity": 290.0,
"maxAngularAcceleration": 250.0
},
"goalEndState": {
"velocity": 0,
"rotation": 0,
"rotateFast": false
},
"reversed": false,
"folder": null,
"previewStartingState": {
"rotation": 0,
"velocity": 0
},
"useDefaultConstraints": true
}
Loading

0 comments on commit 9e6c375

Please sign in to comment.