Fix joystick buttons

[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 4810e4b92c8abe1e748705f1d487854f821ff610..54ffd0091e4ec013cb727f03bc9a11a9e0a3d831 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -27,13 +27,13 @@ public class Constants {
     public final static int ARCADE_INTAKEARM_LEVEL_THREE_PORT = 0;
     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_TRIGGER_PORT = 1;
     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_TRIGGER_PORT = 1;
     public final static int RIGHT_JOYSTICK_THUMB_PORT = 2;
 
     public final static int TOGGLE_SCALING_PORT = 0;
@@ -53,16 +53,18 @@ public class Constants {
     public final static int ENCODER_RIGHT_A = 9;
     public final static int ENCODER_RIGHT_B = 8;
 
-    public static final double INCHES_PER_PULSE = ((3.66 / 5.14) * 6 * Math.PI)
-        / 256;
+    public final static int FORWARD_CHANNEL = 0;
+    public final static int REVERSE_CHANNEL = 1;
+
+    public static final double INCHES_PER_PULSE = ((3.66 / 5.14) * 6 * Math.PI) / 256;
 
     public static double kp = 0.013, ki = 0.000015, kd = -0.002;
     public static double gp = 0.018, gi = 0.000015, gd = 0;
     public static double encoderTolerance = 8.0, gyroTolerance = 5.0;
 
     public static final int MANUAL_MODE = 1, ENCODER_MODE = 2, GYRO_MODE = 3;
-    public static final int LEFT_FORWARD = 6, LEFT_REVERSE = 5,
-        RIGHT_FORWARD = 0, RIGHT_REVERSE = 1;
+    public static final int LEFT_FORWARD = 1, LEFT_REVERSE = 2,
+        RIGHT_FORWARD = 9, RIGHT_REVERSE = 10;
     public static double time = 0;
 
     // Gearing constants