From: AyushNigade Date: Sat, 11 Feb 2017 03:18:19 +0000 (-0800) Subject: Deleted the unnecessary lines of code X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=7cd65a82e59374ba6cae30c6f67e358717f7ee48 Deleted the unnecessary lines of code --- 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 83d558a..a20af8e 100644 --- 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; @@ -39,11 +38,13 @@ public class RunFlyWheel extends Command { } // 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.getShooterRPM()); @@ -52,18 +53,20 @@ public class RunFlyWheel extends Command { } // 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(); } } diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java index 8c8248d..6ac5d77 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java @@ -30,7 +30,6 @@ public class RunFlyWheelContinuous extends Command { public RunFlyWheelContinuous() { // Use requires() here to declare subsystem dependencies // eg. requires(chassis); - requires(shooter); this.wheelP = this.shooter.wheelP; this.wheelI = this.shooter.wheelI; @@ -44,11 +43,13 @@ public class RunFlyWheelContinuous extends Command { } // 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.getShooterRPM()); @@ -57,18 +58,21 @@ public class RunFlyWheelContinuous extends Command { } // Make this return true when this Command no longer needs to run execute() + @Override protected boolean isFinished() { return false; } // 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(); + } }