From: Kevin Zhang Date: Sun, 24 Jan 2016 00:10:12 +0000 (-0800) Subject: Change <= to < and make variable instead of using same function 3 times X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=913142dea025d7127e9039e9bebabc62c4c16bc8 Change <= to < and make variable instead of using same function 3 times --- diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java index 675b4b8c..ef27bf92 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java @@ -19,9 +19,9 @@ public class Shooter extends Subsystem { } public void setSpeed(double speed) { - if (speed >= 1.0) + if (speed > 1.0) shooter.set(1.0); - else if (speed <= -1.0) + else if (speed < -1.0) shooter.set(-1.0); else shooter.set(speed); @@ -37,12 +37,12 @@ public class Shooter extends Subsystem { // Use negative # for decrement. Positive for increment. public void changeSpeed(double change) { - if (getCurrentSetPoint() + change >= 1.0) + double newSpeed = getCurrentSetPoint() + change; + if (newSpeed > 1.0) shooter.set(1.0); - else if (getCurrentSetPoint() + change <= -1.0) + else if (newSpeed <= -1.0) shooter.set(-1.0); else { - double newSpeed = getCurrentSetPoint() + change; setSpeed(newSpeed); } }