From 9fdfc417a44f5f69d68ddb920d71467cbbf172de Mon Sep 17 00:00:00 2001 From: Griffin Date: Sat, 13 Apr 2024 13:51:34 -0400 Subject: [PATCH] moved drawbridige up to reverse trap sequence --- src/main/java/frc/robot/commands/LiftUpCommand.java | 3 --- .../java/frc/robot/commands/ReverseTrapSequenceCommand.java | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/frc/robot/commands/LiftUpCommand.java b/src/main/java/frc/robot/commands/LiftUpCommand.java index f4c7f166..2c57bbba 100644 --- a/src/main/java/frc/robot/commands/LiftUpCommand.java +++ b/src/main/java/frc/robot/commands/LiftUpCommand.java @@ -3,12 +3,10 @@ import edu.wpi.first.math.controller.PIDController; import edu.wpi.first.wpilibj2.command.Command; import frc.robot.constants.LiftConstants; -import frc.robot.subsystems.Drawbridge; import frc.robot.subsystems.Lift; public class LiftUpCommand extends Command { private Lift lift = Lift.getInstance(); - private Drawbridge drawbridge = Drawbridge.getInstance(); public LiftUpCommand() { addRequirements(lift); @@ -39,6 +37,5 @@ public boolean isFinished() { public void end(boolean interrupted) { lift.enableRatchets(); lift.disable(); - drawbridge.up(); } } diff --git a/src/main/java/frc/robot/commands/ReverseTrapSequenceCommand.java b/src/main/java/frc/robot/commands/ReverseTrapSequenceCommand.java index 091ae089..f1231ec2 100644 --- a/src/main/java/frc/robot/commands/ReverseTrapSequenceCommand.java +++ b/src/main/java/frc/robot/commands/ReverseTrapSequenceCommand.java @@ -3,7 +3,6 @@ import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; import edu.wpi.first.wpilibj2.command.WaitUntilCommand; import frc.robot.commands.ScoringElevatorPositionCommand.FinishActions; -import frc.robot.constants.ScoringConstants.ScoringLocation; import frc.robot.subsystems.Lift; import frc.robot.subsystems.ScoringElevator.ElevatorSetpoints; @@ -20,6 +19,7 @@ public ReverseTrapSequenceCommand() { () -> lift.getLeftPosition() >= liftTrapPosition && lift.getRightPosition() >= liftTrapPosition), new ScoringElevatorPositionCommand(ElevatorSetpoints.Ground, - FinishActions.NoDisable)))); + FinishActions.NoDisable))), + new DrawbridgeUpCommand()); } }