Change constants and variable names to be more descriptive

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / OI.java

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index c93ce127ac1cc777d3e7b696721143e17f6ab4ae..606fff68b4dd228c9ea71e44560c65fe015e8b08 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,8 +1,5 @@
 package org.usfirst.frc.team3501.robot;
 
-import org.usfirst.frc.team3501.robot.commands.runShooter;
-import org.usfirst.frc.team3501.robot.commands.setShooterSpeed;
-
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
 import edu.wpi.first.wpilibj.buttons.JoystickButton;
@@ -10,28 +7,26 @@ import edu.wpi.first.wpilibj.buttons.JoystickButton;
 public class OI {
   public static Joystick leftJoystick;
   public static Joystick rightJoystick;
-  public static Button decrementSpeed;
-  public static Button incrementSpeed;
+  public static Button decrementShooterSpeed;
+  public static Button incrementShooterSpeed;
   public static Button outputCurrentShooterSpeed;
-  public static Button runWheel;
+  public static Button trigger;
 
   public OI() {
     leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
     rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
 
-    decrementSpeed = new JoystickButton(rightJoystick,
-        Constants.OI.DECREMENT_SHOOTER_PORT);
-    decrementSpeed.whenPressed(new setShooterSpeed(-0.1));
+    decrementShooterSpeed = new JoystickButton(rightJoystick,
+        Constants.OI.DEC_SHOOTER_SPD_PORT);
 
-    incrementSpeed = new JoystickButton(rightJoystick,
-        Constants.OI.INCREMENT_SHOOTER_PORT);
-    incrementSpeed.whenPressed(new setShooterSpeed(0.1));
+    incrementShooterSpeed = new JoystickButton(rightJoystick,
+        Constants.OI.INC_SHOOTER_SPD_PORT);
 
     outputCurrentShooterSpeed = new JoystickButton(rightJoystick,
         Constants.OI.SHOOTER_PORT);
 
-    runWheel = new JoystickButton(rightJoystick, Constants.OI.TRIGGER_PORT);
-    runWheel.whenPressed(new runShooter());
+    trigger = new JoystickButton(rightJoystick, Constants.OI.TRIGGER_PORT);
+
   }
 
 }