More port fixes

[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 f8c56b762d95a3ce4092a945c3e8051c18da05cd..825ce7a3ca9d47c55d00371ff95aa106ef127f77 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -40,9 +40,9 @@ public class Constants {
     public final static int ENCODER_RIGHT_B = 4;
 
     public static final int LEFT_MODULE = PCM_MODULE_B;
-    public static final int LEFT_FORWARD = 6, LEFT_REVERSE = 5;
+    public static final int LEFT_FORWARD = 1, LEFT_REVERSE = 6;
     public static final int RIGHT_MODULE = PCM_MODULE_B;
-    public static final int RIGHT_FORWARD = 0, RIGHT_REVERSE = 1;
+    public static final int RIGHT_FORWARD = 0, RIGHT_REVERSE = 7;
 
     public static final double INCHES_PER_PULSE = ((3.66 / 5.14) * 6 * Math.PI) / 256;
 
@@ -52,38 +52,16 @@ public class Constants {
     // Gearing constants
     public static final Value HIGH_GEAR = DoubleSolenoid.Value.kForward;
     public static final Value LOW_GEAR = DoubleSolenoid.Value.kReverse;
-
-    public static final double PASS_DEFENSE_TIMEOUT = 10; // find this
-  }
-
-  public static class Scaler {
-    // Piston channels
-    public final static int FORWARD_CHANNEL = 6;
-    public final static int REVERSE_CHANNEL = 0;
-
-    // Winch port
-    public final static int WINCH_MOTOR = 0;
-
-    // Winch speeds
-    public final static double WINCH_STOP_SPEED = 0.0;
-    public final static double SCALE_SPEED = 0;
-    public final static double SECONDS_TO_CLAMP = 2.0;
-
-    // Winch timeout
-    public final static int SECONDS_TO_SCALE = 0;
-
-    public static boolean SCALING = false;
-
   }
 
   public static class Shooter {
-    public static final int CATAPULT1_MODULE = PCM_MODULE_B;
+    public static final int CATAPULT1_MODULE = PCM_MODULE_A;
     public static final int CATAPULT1_FORWARD = 0;
-    public static final int CATAPULT1_REVERSE = 6;
-    public static final int CATAPULT2_MODULE = PCM_MODULE_B;
-    public static final int CATAPULT2_FORWARD = 1;
-    public static final int CATAPULT2_REVERSE = 7;// TODO Determine actual
-                                                  // shooter ports
+    public static final int CATAPULT1_REVERSE = 1;
+    public static final int CATAPULT2_MODULE = PCM_MODULE_A;
+    public static final int CATAPULT2_FORWARD = 2;
+    public static final int CATAPULT2_REVERSE = 3;
+    // TODO Determine actual shooter ports
 
     public static final Value shoot = Value.kForward;
     public static final Value reset = Value.kReverse;
@@ -91,14 +69,16 @@ public class Constants {
   }
 
   public static class IntakeArm {
-    public static final int ROLLER_PORT = 3;
+    public static final int INTAKE_ROLLER_PORT = 3;
 
     // for pistons
-    public static final int LEFT_FORWARD = 0;
-    public static final int LEFT_REVERSE = 1;
-
-    public static final int RIGHT_FORWARD = 2;
-    public static final int RIGHT_REVERSE = 3;
+    public static final int LEFT_INTAKE_MODULE = PCM_MODULE_A;
+    public static final int LEFT_INTAKE_FORWARD = 4;
+    public static final int LEFT_INTAKE_REVERSE = 5;
+    public static final int RIGHT_INTAKE_MODULE = PCM_MODULE_A;
+    public static final int RIGHT_INTAKE_FORWARD = 6;
+    public static final int RIGHT_INTAKE_REVERSE = 7;
+    // TODO Determine actual intake ports
 
     public static final Value EXTEND = DoubleSolenoid.Value.kForward;
     public static final Value RETRACT = DoubleSolenoid.Value.kReverse;