X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FConstants.java;h=fc2c712491b9fc3a3e27f5092ff2b901c07351ea;hb=72fc3c9bd8099194cc4b2c8a747ed9f2be06f1c8;hp=df64a8157f983c29d9c6d3d46e62047895906256;hpb=edf10851494d8eb47056c2cfe6bbf5910b45f546;p=3501%2Fstronghold-2016

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index df64a815..fc2c7124 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;
 
@@ -144,6 +144,7 @@ public class Constants {
     public static final int HAND_CHANNEL = 1;
     public final static double FULL_RANGE = 270.0; // in degrees
     public final static double OFFSET = -135.0; // in degrees
+
     public final static double[] armPotValue = { 0.0, 45.0, 90.0 }; // 3
     // level
     public final static double ARM_LENGTH = 0; // TODO: find actual length