From 647e73b542109d5c957ac33ae1852f9047a106ea Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Fri, 22 Jan 2016 18:39:40 -0800 Subject: [PATCH] Change constants and variable names to be more descriptive --- src/org/usfirst/frc/team3501/robot/Constants.java | 6 +++--- src/org/usfirst/frc/team3501/robot/OI.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index fb630795..966635f5 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -12,9 +12,9 @@ public class Constants { public final static int RIGHT_STICK_PORT = 0; public final static int TRIGGER_PORT = 0; - public final static int DECREMENT_SHOOTER_PORT = 0; - public final static int INCREMENT_SHOOTER_PORT = 0; - public final static int SHOOTER_PORT = 0; + public final static int DEC_SHOOTER_SPD_PORT = 0; + public final static int INC_SHOOTER_SPD_PORT = 0; + public final static int SHOOT_PORT = 0; public final static int PRINT_PORT = 0; } diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java index 9a365a7c..606fff68 100644 --- a/src/org/usfirst/frc/team3501/robot/OI.java +++ b/src/org/usfirst/frc/team3501/robot/OI.java @@ -7,8 +7,8 @@ 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 trigger; @@ -16,11 +16,11 @@ public class 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); + decrementShooterSpeed = new JoystickButton(rightJoystick, + Constants.OI.DEC_SHOOTER_SPD_PORT); - incrementSpeed = new JoystickButton(rightJoystick, - Constants.OI.INCREMENT_SHOOTER_PORT); + incrementShooterSpeed = new JoystickButton(rightJoystick, + Constants.OI.INC_SHOOTER_SPD_PORT); outputCurrentShooterSpeed = new JoystickButton(rightJoystick, Constants.OI.SHOOTER_PORT); -- 2.30.2