X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fcommands%2Fshooter%2FRunIndexWheelContinuous.java;h=d2d386ab040422c72ac3a7863dcc7d8262022f67;hb=b70398a7d5ac5f4ce64156d84227ccb4828c0615;hp=1bf1c6f0c4941cba314eeff63030e066f345e557;hpb=ad7e6b1e386d82e35d6049e211b7c1ae3efe705d;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 1bf1c6f..d2d386a 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
@@ -22,32 +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() {
-    shooter.setIndexWheelMotorVal(shooter.CURRENT_SHOOTING_SPEED);
   }
 
-  // Called repeatedly when this Command is scheduled to run
   @Override
   protected void execute() {
+    double shooterSpeed = shooter.getShooterRPM();
+    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();
@@ -55,7 +52,7 @@ public class RunIndexWheelContinuous extends Command {
 
   @Override
   protected boolean isFinished() {
-    return Robot.getOI().toggleIndexWheel.get();
+    return false;
 
   }