Implement getter and setter methods for current shooting speed

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

diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.java
index bb3fbccf56de701b1b56691b876517bb2b92f562..442897aa9e15eb71f22544f8b2170bb32f2d5b35 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.java
@@ -25,7 +25,6 @@ public class RunFlyWheel extends Command {
   private double target;
 
   public RunFlyWheel(double maxTimeOut) {
-    requires(shooter);
 
     this.wheelP = this.shooter.wheelP;
     this.wheelI = this.shooter.wheelI;
@@ -35,35 +34,39 @@ public class RunFlyWheel extends Command {
     this.wheelController.setDoneRange(0.5);
     this.wheelController.setMaxOutput(1.0);
     this.wheelController.setMinDoneCycles(3);
-    this.target = this.shooter.CURRENT_SHOOTING_SPEED;
+    this.target = this.shooter.getCurrentShootingSpeed();
   }
 
   // Called just before this Command runs the first time
+  @Override
   protected void initialize() {
     this.wheelController.setSetPoint(this.target);
   }
 
   // Called repeatedly when this Command is scheduled to run
+  @Override
   protected void execute() {
     double shooterSpeed = this.wheelController
-        .calcPID(this.shooter.getShooterSpeed());
+        .calcPID(this.shooter.getShooterRPM());
 
     this.shooter.setFlyWheelMotorVal(shooterSpeed);
   }
 
   // Make this return true when this Command no longer needs to run execute()
+  @Override
   protected boolean isFinished() {
     return timeSinceInitialized() >= maxTimeOut;
   }
 
   // Called once after isFinished returns true
+  @Override
   protected void end() {
     this.shooter.stopFlyWheel();
   }
 
   // Called when another command which requires one or more of the same
   // subsystems is scheduled to run
+  @Override
   protected void interrupted() {
-    end();
   }
 }