From 2a9dabb11ba64d9270e7e052626fbf49d84563b7 Mon Sep 17 00:00:00 2001 From: Cindy Zhang Date: Sat, 4 Feb 2017 12:01:59 -0800 Subject: [PATCH] edit continuous commands --- .../team3501/robot/commands/climber/RunWinchContinuous.java | 4 ++-- .../robot/commands/intake/ReverseIntakeContinuous.java | 3 ++- .../robot/commands/shooter/RunFlyWheelContinuous.java | 2 +- .../robot/commands/shooter/RunIndexWheelContinuous.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java index 6b8db75..e201210 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java @@ -8,8 +8,8 @@ import edu.wpi.first.wpilibj.command.Command; * This command runs the drive train motors (which runs the winch) continuously * at a specified speed until the button triggering it is released * - * pre-condition: This command must be run by a button in OI. The robot must be - * attached to the rope. + * pre-condition: This command must be run by a button in OI with + * button.whileHeld(...). The robot must be attached to the rope. * * post-condition: Drive train motors set to a specified speed. * diff --git a/src/org/usfirst/frc/team3501/robot/commands/intake/ReverseIntakeContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/intake/ReverseIntakeContinuous.java index a75a4bb..f446316 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/intake/ReverseIntakeContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/intake/ReverseIntakeContinuous.java @@ -7,7 +7,8 @@ import edu.wpi.first.wpilibj.command.Command; /** * Reverses the intake until the button triggering this command is released * - * pre-condition: button is pressed + * pre-condition: This command must be run by a button in OI with + * button.whileHeld(...). */ public class ReverseIntakeContinuous extends Command { diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java index af77483..1f1d5cd 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java @@ -55,7 +55,7 @@ public class RunFlyWheelContinuous extends Command { @Override protected boolean isFinished() { - return !Robot.getOI().toggleFlyWheel.get(); + return false; } } diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java index bf9af68..adcd1a6 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java @@ -55,7 +55,7 @@ public class RunIndexWheelContinuous extends Command { @Override protected boolean isFinished() { - return Robot.getOI().toggleIndexWheel.get(); + return false; } -- 2.30.2