Skip to content

Commit 073aac6

Browse files
barge auto changes
1 parent 8c91f3a commit 073aac6

File tree

4 files changed

+22
-19
lines changed

4 files changed

+22
-19
lines changed

src/main/deploy/pathplanner/paths/One piece part 2 barge.path

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 6.58380744421885,
12-
"y": 3.97072622940022
11+
"x": 6.602930227919898,
12+
"y": 4.010654731384542
1313
},
1414
"isLocked": false,
1515
"linkedName": null
@@ -20,8 +20,8 @@
2020
"y": 4.020078421927787
2121
},
2222
"prevControl": {
23-
"x": 5.692719585551794,
24-
"y": 4.197501730233285
23+
"x": 5.683538694167147,
24+
"y": 4.226226857329675
2525
},
2626
"nextControl": null,
2727
"isLocked": false,
@@ -34,7 +34,7 @@
3434
"eventMarkers": [],
3535
"globalConstraints": {
3636
"maxVelocity": 4.752,
37-
"maxAcceleration": 5.0,
37+
"maxAcceleration": 2.5,
3838
"maxAngularVelocity": 540.0,
3939
"maxAngularAcceleration": 720.0,
4040
"nominalVoltage": 12.0,
@@ -50,5 +50,5 @@
5050
"velocity": 0,
5151
"rotation": 180.0
5252
},
53-
"useDefaultConstraints": true
53+
"useDefaultConstraints": false
5454
}

src/main/deploy/pathplanner/paths/One piece part 3 barge.path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"maxVelocity": 4.752,
3737
"maxAcceleration": 2.5,
3838
"maxAngularVelocity": 540.0,
39-
"maxAngularAcceleration": 720.0,
39+
"maxAngularAcceleration": 540.0,
4040
"nominalVoltage": 12.0,
4141
"unlimited": false
4242
},

src/main/deploy/pathplanner/paths/OneP Center.path

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 6.6246686906903065,
12-
"y": 4.194390695050413
11+
"x": 6.624777998655663,
12+
"y": 4.174562042674747
1313
},
1414
"isLocked": false,
1515
"linkedName": null
1616
},
1717
{
1818
"anchor": {
19-
"x": 6.605225409836065,
19+
"x": 6.3534836065573765,
2020
"y": 4.168852459016394
2121
},
2222
"prevControl": {
23-
"x": 7.066232772066507,
24-
"y": 4.158843936152193
23+
"x": 7.00914605019554,
24+
"y": 4.1579986667419675
2525
},
2626
"nextControl": null,
2727
"isLocked": false,

src/main/java/team1403/robot/commands/auto/AutoHelper.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,13 @@ public static Command getOnePCenterAlgae(SwerveSubsystem m_swerve) {
4949
NamedCommands.getCommand("CoralScore"),
5050
NamedCommands.getCommand("Loading"),
5151
AutoUtil.loadPathPlannerPath("One piece part 2 barge", m_swerve),
52-
NamedCommands.getCommand("Barge L3"),
53-
NamedCommands.getCommand("ReefAlignCenter"),
52+
//NamedCommands.getCommand("Barge L3"),
53+
Commands.waitSeconds(1),
5454
Commands.race(
55-
NamedCommands.getCommand("Algae Harvest"),
55+
Commands.parallel(
56+
NamedCommands.getCommand("ReefAlignCenter"),
57+
NamedCommands.getCommand("Algae Harvest")
58+
),
5659
Commands.sequence(
5760
Commands.waitSeconds(3.0),
5861
AutoUtil.loadPathPlannerPath("One piece part 3 barge", m_swerve),
@@ -61,10 +64,10 @@ public static Command getOnePCenterAlgae(SwerveSubsystem m_swerve) {
6164
//NamedCommands.getCommand("WaitForSetpoint"),
6265
//NamedCommands.getCommand("Algae Expel") // default command will expel
6366
)
64-
),
65-
Commands.waitSeconds(0.5),
66-
NamedCommands.getCommand("LoadingFromBarge"), //make sure we don't kill ourselves on the barge
67-
AutoUtil.loadPathPlannerPath("One piece part 4 barge", m_swerve)
67+
)
68+
//Commands.waitSeconds(0.5),
69+
//NamedCommands.getCommand("LoadingFromBarge"), //make sure we don't kill ourselves on the barge
70+
//AutoUtil.loadPathPlannerPath("One piece part 4 barge", m_swerve)
6871
);
6972
} catch (Exception e) {
7073
System.err.println("Could not load auto: " + e.getMessage());

0 commit comments

Comments
 (0)