From eab4ce91ee0047cbb42f89c79d9cb219467bdb41 Mon Sep 17 00:00:00 2001
From: Kevin Zhang <icestormf1@gmail.com>
Date: Tue, 16 Feb 2016 11:28:26 -0800
Subject: [PATCH] Change to more descriptive names

---
 src/org/usfirst/frc/team3501/robot/Constants.java             | 4 ++--
 src/org/usfirst/frc/team3501/robot/OI.java                    | 2 +-
 .../usfirst/frc/team3501/robot/commands/auton/LiftRobot.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index df64a815..df2ed0b6 100644
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -86,11 +86,11 @@ public class Constants {
 
     // Winch speeds
     public final static double WINCH_STOP_SPEED = 0.0;
-    public final static double WINCH_IN_SPEED = 0;
+    public final static double SCALE_SPEED = 0;
     public final static double SECONDS_TO_CLAMP = 2.0;
 
     // Winch timeout
-    public final static int WINCH_TIMEOUT = 0;
+    public final static int SECONDS_TO_SCALE = 0;
 
     public static boolean SCALING = false;
 
diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index ad43c2a1..aa58ffcc 100644
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -131,7 +131,7 @@ public class OI {
       // intake button stops the winch
       // shoot button extends the lift
       toggleShooter.whenPressed(new RunWinchContinuous(
-          Constants.Scaler.WINCH_IN_SPEED, Constants.Scaler.WINCH_TIMEOUT));
+          Constants.Scaler.SCALE_SPEED, Constants.Scaler.SECONDS_TO_SCALE));
       compactRobot_1.whenPressed(new RetractLift());
       compactRobot_2.whenPressed(new RetractLift());
 
diff --git a/src/org/usfirst/frc/team3501/robot/commands/auton/LiftRobot.java b/src/org/usfirst/frc/team3501/robot/commands/auton/LiftRobot.java
index dcf20952..a2f1f262 100755
--- a/src/org/usfirst/frc/team3501/robot/commands/auton/LiftRobot.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/auton/LiftRobot.java
@@ -19,7 +19,7 @@ public class LiftRobot extends CommandGroup {
   public LiftRobot() {
     requires(Robot.scaler);
 
-    addSequential(new RunWinchContinuous(Constants.Scaler.WINCH_IN_SPEED, Constants.Scaler.WINCH_TIMEOUT));
+    addSequential(new RunWinchContinuous(Constants.Scaler.SCALE_SPEED, Constants.Scaler.SECONDS_TO_SCALE));
     addSequential(new StopWinch());
   }
 }
-- 
2.30.2