X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FConstants.java;h=a703b0b9f849e6210b4be36fa256b16feb16f7a6;hb=e1f7a74216c8845966fb0fa03a08dfeb3868ff3e;hp=825ce7a3ca9d47c55d00371ff95aa106ef127f77;hpb=fab544eb2395a8aa847abc1890bc635e5ba63a7c;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 825ce7a3..a703b0b9 100644
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -18,20 +18,30 @@ public class Constants {
     public final static int LEFT_STICK_PORT = 0;
     public final static int RIGHT_STICK_PORT = 1;
 
-    public final static int LEFT_JOYSTICK_TRIGGER_PORT = 1;
-
-    public final static int RIGHT_JOYSTICK_TRIGGER_PORT = 1;
-    public final static int RIGHT_JOYSTICK_THUMB_PORT = 2;
-    public final static int RIGHT_JOYSTICK_SHOOT_PORT = 3;
+    // Left Joystick
+    public final static int LEFT_JOYSTICK_GEAR_SHIFT_PORT = 1;
+    public final static int LEFT_JOYSTICK_EXTEND_INTAKE_1_PORT = 3;
+    public final static int LEFT_JOYSTICK_EXTEND_INTAKE_2_PORT = 5;
+    public final static int LEFT_JOYSTICK_RETRACT_INTAKE_1_PORT = 4;
+    public final static int LEFT_JOYSTICK_RETRACT_INTAKE_2_PORT = 6;
+    public final static int LEFT_JOYSTICK_TOGGLE_FRONT_PORT = 7;
+
+    // Right Joystick
+    public final static int RIGHT_JOYSTICK_INTAKE_PORT = 1;
+    public final static int RIGHT_JOYSTICK_OUTTAKE_1_PORT = 3;
+    public final static int RIGHT_JOYSTICK_OUTTAKE_2_PORT = 4;
+    public final static int RIGHT_JOYSTICK_SHOOTER_UP_PORT = 2;
+    public final static int RIGHT_JOYSTICK_SHOOTER_DOWN_1_PORT = 5;
+    public final static int RIGHT_JOYSTICK_SHOOTER_DOWN_2_PORT = 6;
 
   }
 
   public static class DriveTrain {
     // Drivetrain Motor Related Ports
-    public static final int FRONT_LEFT = 1;
-    public static final int FRONT_RIGHT = 6;
-    public static final int REAR_LEFT = 2;
-    public static final int REAR_RIGHT = 5;
+    public static final int DRIVE_FRONT_LEFT = 1;
+    public static final int DRIVE_REAR_LEFT = 2;
+    public static final int DRIVE_FRONT_RIGHT = 6;
+    public static final int DRIVE_REAR_RIGHT = 5;
 
     // Encoder related ports
     public final static int ENCODER_LEFT_A = 0;
@@ -39,10 +49,12 @@ public class Constants {
     public final static int ENCODER_RIGHT_A = 3;
     public final static int ENCODER_RIGHT_B = 4;
 
-    public static final int LEFT_MODULE = PCM_MODULE_B;
-    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 = 7;
+    public static final int LEFT_SHIFT_MODULE = PCM_MODULE_B;
+    public static final int LEFT_SHIFT_FORWARD = 3;
+    public static final int LEFT_SHIFT_REVERSE = 6;
+    public static final int RIGHT_SHIFT_MODULE = PCM_MODULE_B;
+    public static final int RIGHT_SHIFT_FORWARD = 2;
+    public static final int RIGHT_SHIFT_REVERSE = 7;
 
     public static final double INCHES_PER_PULSE = ((3.66 / 5.14) * 6 * Math.PI) / 256;
 
@@ -55,13 +67,12 @@ public class Constants {
   }
 
   public static class Shooter {
-    public static final int CATAPULT1_MODULE = PCM_MODULE_A;
-    public static final int CATAPULT1_FORWARD = 0;
+    public static final int CATAPULT1_MODULE = PCM_MODULE_B;
+    public static final int CATAPULT1_FORWARD = 4;
     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 int CATAPULT2_FORWARD = 0;
+    public static final int CATAPULT2_REVERSE = 1;
 
     public static final Value shoot = Value.kForward;
     public static final Value reset = Value.kReverse;
@@ -69,20 +80,22 @@ public class Constants {
   }
 
   public static class IntakeArm {
-    public static final int INTAKE_ROLLER_PORT = 3;
+    public static final int INTAKE_ROLLER_PORT = 8;
 
     // for pistons
     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 int LEFT_INTAKE_FORWARD = 5;
+    public static final int LEFT_INTAKE_REVERSE = 2;
+    public static final int RIGHT_INTAKE_MODULE = PCM_MODULE_B;
+    public static final int RIGHT_INTAKE_FORWARD = 5;
+    public static final int RIGHT_INTAKE_REVERSE = 0;
 
     public static final Value EXTEND = DoubleSolenoid.Value.kForward;
     public static final Value RETRACT = DoubleSolenoid.Value.kReverse;
 
+    public static final int IN = 1;
+    public static final int OUT = -1;
+
     // for roller
     public static final double INTAKE_SPEED = 0.5;
     public static final double OUTPUT_SPEED = -0.5;