X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FConstants.java;h=4efaf21ef7c46e5a50ef41f985f5bf436ad4597d;hb=9ca89e45fa84b2ec93bc6adf60c7dde1e0a7defb;hp=73efe2dfb45b1b7ed11f7fc9d321c1af3eca9ee1;hpb=510266402afc5a5aa3142570aeee9a02b1473b23;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 73efe2d..4efaf21 100644
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -14,18 +14,23 @@ public class Constants {
   public static class OI {
     public final static int LEFT_STICK_PORT = 0;
     public final static int RIGHT_STICK_PORT = 1;
+    public static final int GAME_PAD_PORT = 2;
 
-    // Need to fill in the port numbers of the following buttons
-    public final static int TOGGLE_FLYWHEEL_PORT = 4;
-    public final static int RUN_INDEXWHEEL_PORT = 1;
-    public final static int REVERSE_INDEXWHEEL_PORT = 2;
     public final static int TOGGLE_GEAR_PORT = 5;
     public final static int RUN_INTAKE_PORT = 1;
-    public final static int REVERSE_INTAKE_PORT = 4;
-    public static final int INCREASE_SHOOTER_SPEED_PORT = 6;
-    public static final int DECREASE_SHOOTER_SPEED_PORT = 2;
+    public final static int REVERSE_INTAKE_PORT = 2;
+
+    public final static int RUN_INDEXWHEEL_PORT = 1;
+    public final static int REVERSE_INDEXWHEEL_PORT = 2;
     public static final int BRAKE_CANTALONS_PORT = 5;
-    public static final int COAST_CANTALONS_PORT = 3;
+    public static final int COAST_CANTALONS_PORT = 6;
+
+    public final static int TOGGLE_FLYWHEEL_PORT = 1;
+    public static final int REVERSE_FLYWHEEL_PORT = 3;
+    public static final int INCREASE_SHOOTER_SPEED_PORT = 8;
+    public static final int DECREASE_SHOOTER_SPEED_PORT = 7;
+    public static final int RESET_SHOOTER_SPEED_PORT = 5;
+    public static final int TOGGLE_GEAR_MANIPULATOR_PORT = 2;
   }
 
   public static class Shooter {
@@ -35,19 +40,17 @@ public class Constants {
     public static final int INDEX_WHEEL = 7;
 
     public final static int HALL_EFFECT_PORT = 9;
-    public static final int MODULE_NUMBER = 10, PISTON_FORWARD = 6,
-        PISTON_REVERSE = 5;
-    public static final Value HIGH_GEAR = DoubleSolenoid.Value.kForward;
-    public static final Value LOW_GEAR = DoubleSolenoid.Value.kReverse;
   }
 
   public static class DriveTrain {
-    // GEARS
-    public static final int PISTON_MODULE = 10, LEFT_GEAR_PISTON_FORWARD = 0,
-        LEFT_GEAR_PISTON_REVERSE = 1, RIGHT_GEAR_PISTON_FORWARD = 2,
-        RIGHT_GEAR_PISTON_REVERSE = 3;
-    public static final Value HIGH_GEAR = DoubleSolenoid.Value.kForward;
-    public static final Value LOW_GEAR = DoubleSolenoid.Value.kReverse;
+    public static final int PISTON_MODULE = 10;
+    public static final int GEAR_MANIPULATOR_PISTON_FORWARD = 4,
+        GEAR_MANIPULATOR_PISTON_REVERSE = 5;
+    public static final int LEFT_GEAR_PISTON_FORWARD = 1,
+        LEFT_GEAR_PISTON_REVERSE = 0, RIGHT_GEAR_PISTON_FORWARD = 3,
+        RIGHT_GEAR_PISTON_REVERSE = 2;
+    public static final Value FORWARD_PISTON_VALUE = DoubleSolenoid.Value.kForward;
+    public static final Value REVERSE_PISTON_VALUE = DoubleSolenoid.Value.kReverse;
 
     // MOTOR CONTROLLERS
     public static final int FRONT_LEFT = 1;