X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fsubsystems%2FShooter.java;h=ef27bf92157dc341fef9f188634a94be34d9ffb3;hb=913142dea025d7127e9039e9bebabc62c4c16bc8;hp=675b4b8cbf52353aa2a70418ee73c5b3ae3f150e;hpb=a0c3ca746a7f9daa124ec1e7495de5417e4ae9f9;p=3501%2Fstronghold-2016

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);
     }
   }