X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fcommands%2Fshooter%2FRunIndexWheelContinuous.java;h=815577e24d63cfde14158f23d4d66400b75a636e;hb=f56e6ebf87134eccc3b8bb0e1d2529bd6cb061dd;hp=da3fee1cb6bdfaf542cafe339e28d45e568ab90e;hpb=f625e57a09b295f7d40e4568a8e3a8cd125630aa;p=3501%2F2017steamworks 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 da3fee1..815577e 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java @@ -22,35 +22,29 @@ public class RunIndexWheelContinuous extends Command { /** * See JavaDoc comment in class for details - * - * @param motorVal - * value range from -1 to 1 */ public RunIndexWheelContinuous() { requires(shooter); } - // Called just before this Command runs the first time @Override protected void initialize() { } - // Called repeatedly when this Command is scheduled to run @Override protected void execute() { double shooterSpeed = shooter.getShooterRPM(); - if (shooterSpeed > 0) + double targetShooterSpeed = shooter.getTargetShootingSpeed(); + double threshold = shooter.getRPMThreshold(); + if (Math.abs(shooterSpeed - targetShooterSpeed) <= threshold) shooter.runIndexWheel(); } - // Called once after isFinished returns true @Override protected void end() { shooter.stopIndexWheel(); } - // Called when another command which requires one or more of the same - // subsystems is scheduled to run @Override protected void interrupted() { end(); @@ -59,7 +53,6 @@ public class RunIndexWheelContinuous extends Command { @Override protected boolean isFinished() { return false; - } }