Skip to content

Commit

Permalink
Merge pull request #56 from zaneal/main
Browse files Browse the repository at this point in the history
Some autos optimized
  • Loading branch information
zaneal authored Mar 17, 2024
2 parents 16cfd17 + d00a618 commit 12a68bf
Show file tree
Hide file tree
Showing 11 changed files with 523 additions and 33 deletions.
144 changes: 144 additions & 0 deletions src/main/deploy/pathplanner/autos/AmpFront.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.8850371358150126,
"y": 6.584480451368311
},
"rotation": 59.72789153297531
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "AutoSpinUp"
}
},
{
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "StartToAmp"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "MediumIntakeCommand"
}
},
{
"type": "path",
"data": {
"pathName": "ToAmpNote"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "InitialShootCenter"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "ShortIntakeCommand"
}
},
{
"type": "path",
"data": {
"pathName": "Front2FromShoot"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "ShootFrom1"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "LongIntakeCommand"
}
},
{
"type": "path",
"data": {
"pathName": "Front3FromShoot"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "StartToSource"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
}
]
}
}
]
}
}
]
}
},
"folder": "Amp",
"choreoAuto": false
}
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/autos/CenterFront.auto
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 1.3164584504524461,
"y": 5.487694894228651
"x": 1.2582679517210889,
"y": 5.4834346983508775
},
"rotation": 0
},
Expand Down Expand Up @@ -90,7 +90,7 @@
{
"type": "path",
"data": {
"pathName": "AmpShoot"
"pathName": "ShootFrom1"
}
},
{
Expand Down Expand Up @@ -121,7 +121,7 @@
{
"type": "path",
"data": {
"pathName": "InitialShootRight"
"pathName": "ShootFrom3"
}
},
{
Expand Down
144 changes: 144 additions & 0 deletions src/main/deploy/pathplanner/autos/SourceFront.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.8565920187395932,
"y": 4.501870313925814
},
"rotation": -58.042774611643864
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "AutoSpinUp"
}
},
{
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "StartToSource"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "MediumIntakeCommand"
}
},
{
"type": "path",
"data": {
"pathName": "Front3FromShoot"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "InitialShootCenter"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "ShortIntakeCommand"
}
},
{
"type": "path",
"data": {
"pathName": "Front2FromShoot"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "InitialShootCenter"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "MediumIntakeCommand"
}
},
{
"type": "path",
"data": {
"pathName": "Front1FromShoot"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "StartToAmp"
}
},
{
"type": "named",
"data": {
"name": "AutoShoot"
}
}
]
}
}
]
}
}
]
}
},
"folder": "Source",
"choreoAuto": false
}
16 changes: 8 additions & 8 deletions src/main/deploy/pathplanner/paths/Front2FromShoot.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"waypoints": [
{
"anchor": {
"x": 2.5,
"y": 5.56
"x": 2.4630582131534635,
"y": 5.534386494698915
},
"prevControl": null,
"nextControl": {
"x": 2.6844894534087316,
"y": 5.535060547231841
"x": 2.647547666562195,
"y": 5.509447041930756
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 2.8880019604117164,
"y": 5.5628329472550995
"x": 2.6410925784814534,
"y": 5.527319753713582
},
"prevControl": {
"x": 2.6983391189004604,
"y": 5.553805186314077
"x": 2.616269908465743,
"y": 5.512354890450522
},
"nextControl": null,
"isLocked": false,
Expand Down
Loading

0 comments on commit 12a68bf

Please sign in to comment.