Skip to content

Commit

Permalink
i love autonomous and oliver does to, oliver also loves other things
Browse files Browse the repository at this point in the history
  • Loading branch information
RudyG252 committed Oct 23, 2024
1 parent 1d48d56 commit a79c35e
Show file tree
Hide file tree
Showing 6 changed files with 219 additions and 30 deletions.
11 changes: 2 additions & 9 deletions src/main/deploy/pathplanner/autos/S C1-5 S Over W1 DEF.auto
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,9 @@
"data": {
"commands": [
{
"type": "sequential",
"type": "path",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "S C1"
}
}
]
"pathName": "S C1"
}
},
{
Expand Down
107 changes: 107 additions & 0 deletions src/main/deploy/pathplanner/autos/S W1 S C1-5 S DEF.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.182727334398768,
"y": 6.395529951663276
},
"rotation": -142.27500495788928
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "deadline",
"data": {
"commands": [
{
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "P CA1"
}
},
{
"type": "named",
"data": {
"name": "ShootInstantlyWhenReady2"
}
},
{
"type": "path",
"data": {
"pathName": "CA1 W1"
}
},
{
"type": "named",
"data": {
"name": "ShootInstantlyWhenReady1"
}
}
]
}
},
{
"type": "named",
"data": {
"name": "PrepareSWD"
}
}
]
}
},
{
"type": "deadline",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "W1 C1"
}
},
{
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "StopAll"
}
},
{
"type": "wait",
"data": {
"waitTime": 1.0
}
},
{
"type": "named",
"data": {
"name": "ToIndexer"
}
}
]
}
}
]
}
},
{
"type": "named",
"data": {
"name": "C1toC5default"
}
}
]
}
},
"folder": "Normal",
"choreoAuto": false
}
101 changes: 101 additions & 0 deletions src/main/deploy/pathplanner/autos/S W3-1 S C1-5 S DEF.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.29235458470917,
"y": 4.778983272252259
},
"rotation": 151.53108100340572
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "FullPowerPreload"
}
},
{
"type": "deadline",
"data": {
"commands": [
{
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "S W3-1 Bayou"
}
},
{
"type": "named",
"data": {
"name": "ShootInstantlyWhenReady"
}
}
]
}
},
{
"type": "named",
"data": {
"name": "PrepareSWD"
}
}
]
}
},
{
"type": "deadline",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "W1 C1"
}
},
{
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "StopAll"
}
},
{
"type": "wait",
"data": {
"waitTime": 1.0
}
},
{
"type": "named",
"data": {
"name": "ToIndexer"
}
}
]
}
}
]
}
},
{
"type": "named",
"data": {
"name": "C1toC5default"
}
}
]
}
},
"folder": "Normal",
"choreoAuto": false
}
16 changes: 2 additions & 14 deletions src/main/deploy/pathplanner/autos/S W3-1 S C1-5 S.auto
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,15 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 1.182727334398768,
"y": 6.395529951663276
"x": 1.29235458470917,
"y": 4.778983272252259
},
"rotation": 151.53108100340572
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "wait",
"data": {
"waitTime": 0.3
}
},
{
"type": "named",
"data": {
Expand All @@ -37,12 +31,6 @@
"pathName": "S W3-1 Bayou"
}
},
{
"type": "named",
"data": {
"name": "EnableLimelight"
}
},
{
"type": "named",
"data": {
Expand Down
10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/paths/W2 C3.path
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"prevControl": null,
"nextControl": {
"x": 4.722849836116708,
"y": 4.625468700804305
"x": 5.202725850291558,
"y": 4.411401278318571
},
"isLocked": false,
"linkedName": "W2"
Expand All @@ -20,8 +20,8 @@
"y": 4.095455268178173
},
"prevControl": {
"x": 5.677080386991298,
"y": 4.2102691481336825
"x": 5.718850061662163,
"y": 3.729727791602677
},
"nextControl": null,
"isLocked": false,
Expand All @@ -39,7 +39,7 @@
},
"goalEndState": {
"velocity": 0.0,
"rotation": 179.09166216609205,
"rotation": -169.4937204001024,
"rotateFast": false
},
"reversed": false,
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/frc/robot/util/auto/PathPlannerStorage.java
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,10 @@ private Command generateCenterDefaultCommand(int i, int endingNote, boolean goin
.raceWith(Commands.waitUntil(() -> !shooterSensor.getAsBoolean() && !elevatorSensor.getAsBoolean() && swerve.insideOwnWing())),
NamedCommands.getCommand("StopIntake")
.andThen(NamedCommands.getCommand("ToIndexer")
.onlyIf(() -> !shooterSensor.getAsBoolean())),
.unless(shooterSensor)),
NamedCommands.getCommand("PrepareSWD")
),
NamedCommands.getCommand("ShootInstantlyWhenReady"),
NamedCommands.getCommand("ShootInstantlyWhenReady2"),
Commands.deadline(
AutoBuilder.followPath(getNoteAfterShot),
Commands.sequence(
Expand Down

0 comments on commit a79c35e

Please sign in to comment.