X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FConstants.java;h=ae20a9f094594390fff09fe889f1a49ef5a98345;hb=a68e434724e98b4d1563e0781e5b542075815c5a;hp=bdfa1ad03bda9eca2287533dfc64a757f9b19ee4;hpb=30881d93e32c79fe4e20d5286af3636c9fd45a72;p=3501%2Fstronghold-2016

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index bdfa1ad0..ae20a9f0 100644
--- 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;
 
@@ -55,13 +55,13 @@ public class Constants {
   }
 
   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_MODULE = PCM_MODULE_A;
     public static final int CATAPULT2_FORWARD = 1;
-    public static final int CATAPULT2_REVERSE = 7;// TODO Determine actual
-                                                  // shooter ports
+    public static final int CATAPULT2_REVERSE = 7;
+    // TODO Determine actual shooter ports
 
     public static final Value shoot = Value.kForward;
     public static final Value reset = Value.kReverse;
@@ -69,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 = 0;
+    public static final int LEFT_INTAKE_REVERSE = 1;
+    public static final int RIGHT_INTAKE_MODULE = PCM_MODULE_A;
+    public static final int RIGHT_INTAKE_FORWARD = 2;
+    public static final int RIGHT_INTAKE_REVERSE = 3;
+    // TODO Determine actual intake ports
 
     public static final Value EXTEND = DoubleSolenoid.Value.kForward;
     public static final Value RETRACT = DoubleSolenoid.Value.kReverse;