Skip to content

Commit f4963fd

Browse files
committed
Added Amp Side Escape
1 parent 8d464f7 commit f4963fd

File tree

3 files changed

+61
-5
lines changed

3 files changed

+61
-5
lines changed

src/main/deploy/pathplanner/paths/6 Shoot.path

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
},
1717
{
1818
"anchor": {
19-
"x": 4.635439403975525,
19+
"x": 4.64,
2020
"y": 4.625468700804305
2121
},
2222
"prevControl": {
23-
"x": 5.8263814243891465,
23+
"x": 5.830942020413621,
2424
"y": 4.076031404657965
2525
},
2626
"nextControl": null,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"version": 1.0,
3+
"waypoints": [
4+
{
5+
"anchor": {
6+
"x": 4.64,
7+
"y": 4.625468700804305
8+
},
9+
"prevControl": null,
10+
"nextControl": {
11+
"x": 3.186919968145987,
12+
"y": 7.7808159412285605
13+
},
14+
"isLocked": false,
15+
"linkedName": "6 Shoot End"
16+
},
17+
{
18+
"anchor": {
19+
"x": 8.26051834784571,
20+
"y": 6.651185591813652
21+
},
22+
"prevControl": {
23+
"x": 7.260518347845711,
24+
"y": 6.651185591813652
25+
},
26+
"nextControl": null,
27+
"isLocked": false,
28+
"linkedName": null
29+
}
30+
],
31+
"rotationTargets": [],
32+
"constraintZones": [],
33+
"eventMarkers": [],
34+
"globalConstraints": {
35+
"maxVelocity": 3.25,
36+
"maxAcceleration": 5.0,
37+
"maxAngularVelocity": 540.0,
38+
"maxAngularAcceleration": 720.0
39+
},
40+
"goalEndState": {
41+
"velocity": 0,
42+
"rotation": 0,
43+
"rotateFast": false
44+
},
45+
"reversed": false,
46+
"folder": "BETWEEN NOTES",
47+
"previewStartingState": {
48+
"rotation": 0,
49+
"velocity": 0
50+
},
51+
"useDefaultConstraints": true
52+
}

src/main/java/frc/robot/RobotContainer.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -806,6 +806,7 @@ private Command aim() {
806806
private Command farSideSkip() {
807807
return new SequentialCommandGroup(
808808
AutoBuilder.followPath(PathPlannerPath.fromPathFile("Far Start to Preload")),
809+
aim(),
809810
fireSequence(),
810811
AutoBuilder.followPath(PathPlannerPath.fromPathFile("Source Preload to 4")),
811812
visionIntake(),
@@ -829,7 +830,8 @@ private Command farSideSkip() {
829830
visionIntake(),
830831
AutoBuilder.followPath(PathPlannerPath.fromPathFile("6 Shoot")),
831832
aim(),
832-
fireSequence());
833+
fireSequence(),
834+
AutoBuilder.followPath(PathPlannerPath.fromPathFile("Amp Side Escape")));
833835
}
834836

835837
// Bypass Skip original route title
@@ -861,7 +863,8 @@ private Command bypassSkip() {
861863
() -> indexer.isProx1Active() || indexer.isProx2Active()),
862864
AutoBuilder.followPath(PathPlannerPath.fromPathFile("6 Shoot")),
863865
aim(),
864-
fireSequence());
866+
fireSequence(),
867+
AutoBuilder.followPath(PathPlannerPath.fromPathFile("Amp Side Escape")));
865868
}
866869

867870
// Amp Side Skip original route
@@ -896,7 +899,8 @@ private Command ampSideSkip() {
896899
() -> indexer.isProx1Active() || indexer.isProx2Active()),
897900
AutoBuilder.followPath(PathPlannerPath.fromPathFile("6 Shoot")),
898901
aim(),
899-
fireSequence());
902+
fireSequence(),
903+
AutoBuilder.followPath(PathPlannerPath.fromPathFile("Amp Side Escape")));
900904
}
901905

902906
private Command pathPlannerCommand() {

0 commit comments

Comments
 (0)