Only run indexwheel if flywheel is running

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / commands / shooter / RunIndexWheelContinuous.java

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 377f4aadc16ab55897762f2f3a4f34ca3a96fb12..f958be7fa4788e067e93b225680d56045e08c532 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
@@ -1,6 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands.shooter;
 
 import org.usfirst.frc.team3501.robot.Robot;
+import org.usfirst.frc.team3501.robot.subsystems.Shooter;
 
 import edu.wpi.first.wpilibj.command.Command;
 
@@ -17,7 +18,7 @@ import edu.wpi.first.wpilibj.command.Command;
  * @author Shaina
  */
 public class RunIndexWheelContinuous extends Command {
-  private double motorVal;
+  private Shooter shooter = Robot.getShooter();
 
   /**
    * See JavaDoc comment in class for details
@@ -25,24 +26,28 @@ public class RunIndexWheelContinuous extends Command {
    * @param motorVal
    *          value range from -1 to 1
    */
-  public RunIndexWheelContinuous(double motorVal) {
-    this.motorVal = motorVal;
+  public RunIndexWheelContinuous() {
+    requires(shooter);
   }
 
   // Called just before this Command runs the first time
   @Override
   protected void initialize() {
-    Robot.getShooter().setIndexWheelMotorVal(motorVal);
   }
 
   // Called repeatedly when this Command is scheduled to run
   @Override
   protected void execute() {
+    double shooterSpeed = shooter.getShooterRPM();
+    if (shooterSpeed > 0) {
+      shooter.setIndexWheelMotorVal(shooter.DEFAULT_INDEXING_SPEED);
+    }
   }
 
   // Called once after isFinished returns true
   @Override
   protected void end() {
+    shooter.stopIndexWheel();
   }
 
   // Called when another command which requires one or more of the same
@@ -54,12 +59,8 @@ public class RunIndexWheelContinuous extends Command {
 
   @Override
   protected boolean isFinished() {
-<<<<<<< 7fe535d58b388a1d87b3728095d8a38786865468
     return false;
-=======
-    // TODO
-    return Robot.getOI().toggleIndexWheel.get();
->>>>>>> Add buttons to OI class
+
   }
 
 }