From 913142dea025d7127e9039e9bebabc62c4c16bc8 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Sat, 23 Jan 2016 16:10:12 -0800 Subject: [PATCH] Change <= to < and make variable instead of using same function 3 times --- .../usfirst/frc/team3501/robot/subsystems/Shooter.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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); } } -- 2.30.2