From b9c829dafe0f85b1677c2d87673dfe9fe52d3fc1 Mon Sep 17 00:00:00 2001 From: BenG49 Date: Wed, 10 Apr 2024 20:59:08 -0400 Subject: [PATCH] Comment reroutable hgf --- .../auton/HGF/ReroutableFourPieceHGF.java | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/stuypulse/robot/commands/auton/HGF/ReroutableFourPieceHGF.java b/src/main/java/com/stuypulse/robot/commands/auton/HGF/ReroutableFourPieceHGF.java index 9dca919b..2521e4bd 100644 --- a/src/main/java/com/stuypulse/robot/commands/auton/HGF/ReroutableFourPieceHGF.java +++ b/src/main/java/com/stuypulse/robot/commands/auton/HGF/ReroutableFourPieceHGF.java @@ -18,9 +18,10 @@ public class ReroutableFourPieceHGF extends SequentialCommandGroup { - - public ReroutableFourPieceHGF(PathPlannerPath... paths) { + PathPlannerPath H_TO_G = paths[6]; + PathPlannerPath G_TO_F = paths[7]; + addCommands( new ParallelCommandGroup( new WaitCommand(0.25) @@ -33,31 +34,44 @@ public ReroutableFourPieceHGF(PathPlannerPath... paths) { new ShooterWaitForTarget(), ConveyorShootRoutine.untilNoteShot(0.75), + // intake H new FollowPathAndIntake(paths[0]), new ConditionalCommand( + // has H new SequentialCommandGroup( + // shoot H, intake G new FollowPathAlignAndShootFast(paths[1], new FastAlignShootSpeakerRelative(-45, 1.0)), new FollowPathAndIntake(paths[2]), new ConditionalCommand( + // shoot G, intake F, shoot F new SequentialCommandGroup( new FollowPathAlignAndShootFast(paths[3], new FastAlignShootSpeakerRelative(-45)), new FollowPathAndIntake(paths[4]), new FollowPathAlignAndShoot(paths[5], SwerveDriveToPose.speakerRelative(-45))), + + // intake F, shoot F new SequentialCommandGroup( - new FollowPathAndIntake(paths[7]), + new FollowPathAndIntake(G_TO_F), new FollowPathAlignAndShoot(paths[5], SwerveDriveToPose.speakerRelative(-45))), Intake.getInstance()::hasNote)), + // no H new SequentialCommandGroup( - new FollowPathAndIntake(paths[6]), + // intake G + new FollowPathAndIntake(H_TO_G), new ConditionalCommand( + // shoot G, intake F, shoot F new SequentialCommandGroup( new FollowPathAlignAndShootFast(paths[3], new FastAlignShootSpeakerRelative(-45)), new FollowPathAndIntake(paths[4]), new FollowPathAlignAndShoot(paths[5], SwerveDriveToPose.speakerRelative(-45))), + + // intake F, shoot F new SequentialCommandGroup( - new FollowPathAndIntake(paths[7]), + new FollowPathAndIntake(G_TO_F), new FollowPathAlignAndShoot(paths[5], SwerveDriveToPose.speakerRelative(-45))), + Intake.getInstance()::hasNote)), + Intake.getInstance()::hasNote) ); }