shooter code review changes

[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 976a1883ef8982086510318bdbdf2e24ae430570..da3fee1cb6bdfaf542cafe339e28d45e568ab90e 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,23 +1,33 @@
 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;
 
 /**
- * This command will run the index wheel motor continuously until the button
+ * This command runs index wheel continuously when OI button managing index
+ * wheel is pressed. The command will run the index wheel motor until the button
  * triggering it is released.
  *
+ * Should only be run from the operator interface.
+ *
  * pre-condition: This command must be run by a button in OI with
  * button.whileHeld(...).
  *
- * @param motorVal
- *          value range is from -1 to 1
- * @author shaina
+ * @author Shaina
  */
 public class RunIndexWheelContinuous extends Command {
-  private double motorVal;
+  private Shooter shooter = Robot.getShooter();
 
-  public RunIndexWheelContinuous(double motorVal) {
-    this.motorVal = motorVal;
+  /**
+   * 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
@@ -28,22 +38,28 @@ public class RunIndexWheelContinuous extends Command {
   // Called repeatedly when this Command is scheduled to run
   @Override
   protected void execute() {
+    double shooterSpeed = shooter.getShooterRPM();
+    if (shooterSpeed > 0)
+      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();
   }
 
   @Override
   protected boolean isFinished() {
     return false;
+
   }
 
 }