Fix formatting and stuff

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

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 59bbcca3f1baf6561bcd3882aa8a0c4dfc3806b5..9c666016ae1b768cafebd34e3512bb890830bb6b 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -17,7 +17,7 @@ public class Constants {
 
     public final static int PASS_PORTCULLIS_PORT = 0;
     public final static int PASS_CHEVAL_DE_FRISE_PORT = 0;
-    public final static int PASS_DRAWBRIDGE = 0;
+    public final static int PASS_DRAWBRIDGE_PORT = 0;
     public final static int PASS_SALLYPORT_PORT = 0;
 
     public final static int ARCADE_INTAKEARM_LEVEL_ONE_PORT = 0;
@@ -26,15 +26,16 @@ public class Constants {
     public final static int ARCADE_INTAKEARM_LEVEL_FOUR_PORT = 0;
 
     public final static int LEFT_JOYSTICK_TRIGGER_PORT = 0;
-    public final static int LEFT_JOYSTICK_TOP_LEFT_PORT = 4;
-    public final static int LEFT_JOYSTICK_TOP_RIGHT_PORT = 5;
+    public final static int SPIN1_PORT = 4;
+    public final static int SPIN2_PORT = 5;
     public final static int LEFT_JOYSTICK_TOP_CENTER_PORT = 3;
     public final static int LEFT_JOYSTICK_TOP_LOW_PORT = 2;
 
     public final static int RIGHT_JOYSTICK_TRIGGER_PORT = 0;
     public final static int RIGHT_JOYSTICK_THUMB_PORT = 2;
 
-    public final static int SCALING_BUTTON_PORT = 0;
+    public final static int TOGGLE_SCALING_PORT = 0;
+
   }
 
   public static class DriveTrain {
@@ -85,6 +86,9 @@ public class Constants {
     public final static double WINCH_STOP_SPEED = 0.0;
     public final static double WINCH_IN_SPEED = 0;
     public final static double SECONDS_TO_CLAMP = 2.0;
+
+    public static boolean SCALING = false;
+
   }
 
   public static class Shooter {