Skip to content

Commit

Permalink
Merge pull request #47 from zaneal/main
Browse files Browse the repository at this point in the history
Good stuff
  • Loading branch information
zaneal authored Mar 5, 2024
2 parents cf1e4a3 + f76fd67 commit 32edbf7
Show file tree
Hide file tree
Showing 30 changed files with 429 additions and 173 deletions.
4 changes: 2 additions & 2 deletions .pathplanner/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"Amp",
"Source"
],
"defaultMaxVel": 6.5,
"defaultMaxAccel": 3.5,
"defaultMaxVel": 6.7,
"defaultMaxAccel": 8.0,
"defaultMaxAngVel": 540.0,
"defaultMaxAngAccel": 720.0,
"maxModuleSpeed": 7.0
Expand Down
11 changes: 2 additions & 9 deletions src/main/deploy/pathplanner/autos/Amp1.auto
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,9 @@
}
},
{
"type": "parallel",
"type": "named",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "AutoShoot"
}
}
]
"name": "AutoShoot"
}
}
]
Expand Down
206 changes: 206 additions & 0 deletions src/main/deploy/pathplanner/autos/Center6.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.3741268732537468,
"y": 5.543591073293259
},
"rotation": 0.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "AutoSpinUp"
}
},
{
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "InitialShootCenter"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "IntakeCommand"
}
},
{
"type": "path",
"data": {
"pathName": "Front2FromShoot"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "InitialShootCenter"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "IntakeCommand"
}
},
{
"type": "path",
"data": {
"pathName": "Front1FromShoot"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "AmpShoot"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "IntakeCommand"
}
},
{
"type": "path",
"data": {
"pathName": "Front3FromShoot"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "InitialShootRight"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "IntakeCommand"
}
},
{
"type": "path",
"data": {
"pathName": "Back2"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "AmpShoot"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "IntakeCommand"
}
},
{
"type": "path",
"data": {
"pathName": "Back1"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "AmpShoot"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
}
]
}
}
]
}
}
]
}
},
"folder": "Center",
"choreoAuto": false
}
9 changes: 1 addition & 8 deletions src/main/deploy/pathplanner/autos/Source3.auto
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,7 @@
"data": {
"pathName": "InitialShootRight"
}
}
]
}
},
{
"type": "parallel",
"data": {
"commands": [
},
{
"type": "named",
"data": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/navgrid.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/AmpShoot.path
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 6.5,
"maxAcceleration": 3.5,
"maxVelocity": 6.7,
"maxAcceleration": 8.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Back1.path
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 6.5,
"maxAcceleration": 3.5,
"maxVelocity": 6.7,
"maxAcceleration": 8.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Back2.path
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 6.5,
"maxAcceleration": 3.5,
"maxVelocity": 6.7,
"maxAcceleration": 8.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Back3.path
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 6.5,
"maxAcceleration": 3.5,
"maxVelocity": 6.7,
"maxAcceleration": 8.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Back4.path
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 6.5,
"maxAcceleration": 3.5,
"maxVelocity": 6.7,
"maxAcceleration": 8.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Back5.path
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 6.5,
"maxAcceleration": 3.5,
"maxVelocity": 6.7,
"maxAcceleration": 8.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Front1FromShoot.path
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 6.5,
"maxAcceleration": 3.5,
"maxVelocity": 6.7,
"maxAcceleration": 8.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Front1FromStart.path
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 6.5,
"maxAcceleration": 3.5,
"maxVelocity": 6.7,
"maxAcceleration": 8.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Front2FromShoot.path
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 6.5,
"maxAcceleration": 3.5,
"maxVelocity": 6.7,
"maxAcceleration": 8.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Front2FromStart.path
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 6.5,
"maxAcceleration": 3.5,
"maxVelocity": 6.7,
"maxAcceleration": 8.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Front3FromShoot.path
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 6.5,
"maxAcceleration": 3.5,
"maxVelocity": 6.7,
"maxAcceleration": 8.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Front3FromStart.path
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 6.5,
"maxAcceleration": 3.5,
"maxVelocity": 6.7,
"maxAcceleration": 8.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
Loading

0 comments on commit 32edbf7

Please sign in to comment.