Make style edits

diff --git a/src/org/usfirst/frc/team3501/robot/commands/ShooterTest.java b/src/org/usfirst/frc/team3501/robot/commands/ShooterTest.java
index b4b2423487ae5a3b61b8bd985ff34559669481ee..a256bad47a5bde38097fd3df125f85765c9ed207 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/ShooterTest.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/ShooterTest.java
@@ -16,6 +16,7 @@ public class ShooterTest extends Command {
 
   @Override
   protected void initialize() {
+    Robot.shooter.setSpeed(0.5);
   }
 
   @Override
@@ -34,11 +35,11 @@ public class ShooterTest extends Command {
     }
 
     if (leftSidePressed == true) {
-      Robot.shooter.setDecrementSpeed(0.1);
+      Robot.shooter.decrementSpeed(0.1);
     }
 
     if (rightSidePressed == true) {
-      Robot.shooter.setIncrementSpeed(0.1);
+      Robot.shooter.incrementSpeed(0.1);
     }
 
     if (thumbPressed == true) {

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index 614fe059a9a31851d904a71f2c07c495ad2633ce..c562b20adfb727295ddd8ffba19addba4133b6d2 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@ -20,30 +20,29 @@ public class Shooter extends Subsystem {
     wheel.set(speed);\r
   }\r
 \r
-  public void setIncrementSpeed(double increment) {\r
-    double newSpeed = getCurrentSpeed() + increment;\r
-\r
-    if (getCurrentSpeed() >= 1.0) {\r
+  public void incrementSpeed(double increment) {\r
+    if (getCurrentSpeed() >= 1.0)\r
       wheel.set(1.0);\r
-    } else if (getCurrentSpeed() <= -1.0) {\r
+    else if (getCurrentSpeed() <= -1.0)\r
       wheel.set(-1.0);\r
+    else {\r
+      double newSpeed = getCurrentSpeed() + increment;\r
+      wheel.set(newSpeed);\r
     }\r
-\r
-    wheel.set(newSpeed);\r
   }\r
 \r
   // THIS DECREMENT METHOD TAKES ONLY POSITIVE VALUES SINCE IT ACCOUNTS FOR\r
   // SUBTRACTING THE CURRENT MOTOR SPEED!\r
-  public void setDecrementSpeed(double decrement) {\r
-    double newSpeed = getCurrentSpeed() - decrement;\r
+  public void decrementSpeed(double decrement) {\r
 \r
-    if (getCurrentSpeed() >= 1.0) {\r
+    if (getCurrentSpeed() >= 1.0)\r
       wheel.set(1.0);\r
-    } else if (getCurrentSpeed() <= -1.0) {\r
+    else if (getCurrentSpeed() <= -1.0)\r
       wheel.set(-1.0);\r
+    else {\r
+      double newSpeed = getCurrentSpeed() - decrement;\r
+      wheel.set(newSpeed);\r
     }\r
-\r
-    wheel.set(newSpeed);\r
   }\r
 \r
   @Override\r