competition fixes

[3501/2017steamworks] / 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 f0cc6e2a0f0286ed0aafe6ce1b3d845e0e68c7a9..4efaf21ef7c46e5a50ef41f985f5bf436ad4597d 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -18,18 +18,19 @@ public class Constants {
 
     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 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 final static int TOGGLE_FLYWHEEL_PORT = 4;
-    public static final int REVERSE_FLYWHEEL_PORT = 1;
-    public static final int INCREASE_SHOOTER_SPEED_PORT = 6;
-    public static final int DECREASE_SHOOTER_SPEED_PORT = 2;
-    public static final int TOGGLE_GEAR_MANIPULATOR_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 {
@@ -39,19 +40,14 @@ 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 = 4,
-        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 {
     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 = 0,
-        LEFT_GEAR_PISTON_REVERSE = 1, RIGHT_GEAR_PISTON_FORWARD = 3,
+    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;