From 523be688cc1fe0355f9847178fcdabecb3d163ab Mon Sep 17 00:00:00 2001 From: "Keenan D. Buckley" Date: Sun, 8 Mar 2020 14:35:46 -0600 Subject: [PATCH] Don't go into Intake mode if reset times out --- .../java/frc4388/robot/commands/storage/ManageStorage.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/frc4388/robot/commands/storage/ManageStorage.java b/src/main/java/frc4388/robot/commands/storage/ManageStorage.java index 0bf0519..4599017 100644 --- a/src/main/java/frc4388/robot/commands/storage/ManageStorage.java +++ b/src/main/java/frc4388/robot/commands/storage/ManageStorage.java @@ -119,8 +119,10 @@ public class ManageStorage extends CommandBase { private void runReset() { m_storage.runStorage(-StorageConstants.STORAGE_SPEED); - if (isBallInIntake || (m_resetStartTime + StorageConstants.STORAGE_TIMEOUT) < System.currentTimeMillis()) { + if (isBallInIntake) { m_storageMode = StorageMode.INTAKE; + } else if (m_resetStartTime + StorageConstants.STORAGE_TIMEOUT < System.currentTimeMillis()) { + m_storageMode = StorageMode.IDLE; } m_isStorageEmpty = !isBallInStorage; }