From 2a2b594b9c38e44cb77ff70bf8273fe113464566 Mon Sep 17 00:00:00 2001 From: "Keenan D. Buckley" Date: Sun, 8 Mar 2020 14:30:52 -0600 Subject: [PATCH] Change to reset everytime storage returns to the default command --- src/main/java/frc4388/robot/RobotContainer.java | 4 ++-- .../java/frc4388/robot/commands/storage/ManageStorage.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index b7a17ce..17f28d0 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -126,7 +126,7 @@ public class RobotContainer { m_robotLED.setDefaultCommand(new RunCommand(() -> m_robotLED.updateLED(), m_robotLED)); // runs the storage not //m_robotStorage.setDefaultCommand(new RunCommand(() -> m_robotStorage.runStorage(0), m_robotStorage)); - m_robotStorage.setDefaultCommand(new RunCommand(() -> m_robotStorage.runStorage(0), m_robotStorage)); + m_robotStorage.setDefaultCommand(new ManageStorage(m_robotStorage, StorageMode.IDLE)); //m_robotLime.setDefaultCommand(new RunCommand(() -> m_robotLime.limeOff(), m_robotLime)); } @@ -230,7 +230,7 @@ public class RobotContainer { //Run drum new JoystickButton(getOperatorJoystick(), XboxController.B_BUTTON) .whileHeld(new ShootPrepGroup(m_robotShooter, m_robotShooterAim, m_robotShooterHood, m_robotStorage), false) - .whenReleased(new ManageStorage(m_robotStorage, StorageMode.RESET)) + //.whenReleased(new ManageStorage(m_robotStorage, StorageMode.RESET)) .whenReleased(new InstantCommand(() -> m_robotLime.limeOff())); } diff --git a/src/main/java/frc4388/robot/commands/storage/ManageStorage.java b/src/main/java/frc4388/robot/commands/storage/ManageStorage.java index 4e019c7..0bf0519 100644 --- a/src/main/java/frc4388/robot/commands/storage/ManageStorage.java +++ b/src/main/java/frc4388/robot/commands/storage/ManageStorage.java @@ -128,6 +128,7 @@ public class ManageStorage extends CommandBase { // Called once the command ends or is interrupted. @Override public void end(boolean interrupted) { + m_storageMode = StorageMode.RESET; } // Returns true when the command should end.