X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fcommands%2Fshooter%2FRunIndexWheel.java;h=6abb095b60a0a5ac74de61627244f479ae2248f6;hb=7ba6bc91b8cf7205e05cdb974dc80fdd668ebe59;hp=3f8baa0c3ffe2527e59701e9967115371685f979;hpb=d7042bec1cddc809132fcc233ba3320b0b6681d9;p=3501%2F2017steamworks diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheel.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheel.java index 3f8baa0..6abb095 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheel.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheel.java @@ -39,9 +39,10 @@ public class RunIndexWheel extends Command { @Override protected void execute() { double shooterSpeed = shooter.getShooterRPM(); - if (shooterSpeed > 0) { - shooter.setIndexWheelMotorVal(shooter.DEFAULT_INDEXING_SPEED); - } + double targetShooterSpeed = shooter.getTargetShootingSpeed(); + double threshold = shooter.getRPMThreshold(); + if (Math.abs(shooterSpeed - targetShooterSpeed) <= threshold) + shooter.runIndexWheel(); } // Called once after isFinished returns true