X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FConstants.java;fp=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FConstants.java;h=262d7846ce093e254eb91f6419a3da7486a14441;hp=520959a9de46a7c37728923b06244a7f21491abe;hb=0a179caa3cb1017af9fc7dab08c7123c3407e84f;hpb=03926b5fa23be90ab6c5ad77c3204a8b94fc02ed

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 520959a9..262d7846 100644
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -28,11 +28,18 @@ public class Constants {
     public final static int ARCADE_INTAKEARM_LEVEL_FOUR_PORT = 0;
 
     public final static int LEFT_JOYSTICK_TRIGGER_PORT = 1;
-    public final static int SPIN1_PORT = 4;
-    public final static int SPIN2_PORT = 5;
+    public final static int LEFT_JOYSTICK_TOP_LEFT_BUTTON = 4;
+    public final static int LEFT_JOYSTICK_TOP_RIGHT_BUTTON = 5;
     public final static int LEFT_JOYSTICK_TOP_CENTER_PORT = 3;
     public final static int LEFT_JOYSTICK_TOP_LOW_PORT = 2;
 
+    public final static int LEFT_JOYSTICK_BOTTOM_BACK_LEFT_BUTTON = 8;
+    public final static int LEFT_JOYSTICK_BOTTOM_BACK_RIGHT_BUTTON = 9;
+    public final static int LEFT_JOYSTICK_BOTTOM_LEFT_FORWARD_BUTTON = 6;
+    public final static int LEFT_JOYSTICK_BOTTOM_LEFT_BACK_BUTTON = 7;
+    public final static int LEFT_JOYSTICK_BOTTOM_RIGHT_FORWARD_BUTTON = 11;
+    public final static int LEFT_JOYSTICK_BOTTOM_RIGHT_BACK_BUTTON = 10;
+
     public final static int RIGHT_JOYSTICK_TRIGGER_PORT = 1;
     public final static int RIGHT_JOYSTICK_THUMB_PORT = 2;
 
@@ -131,7 +138,8 @@ public class Constants {
 
   public static class IntakeArm {
     public static final int ROLLER_PORT = 0;
-    public static final int ARM_PORT = 1;
+    public static final int LEFT_ARM_PORT = 1;
+    public static final int RIGHT_ARM_PORT = 1;
     public static final int POT_CHANNEL = 0;
     public static final double INTAKE_SPEED = 0.5;
     public static final double OUTPUT_SPEED = -0.5;
@@ -139,6 +147,7 @@ public class Constants {
     public final static double OFFSET = -135.0; // in degrees
     public static final double ZERO_ANGLE = 0;
     public static final double DEFAULT_INTAKE_ARM_SPEED = 0.3;
+    public static final double STOP_INTAKE_ARM_SPEED = 0.0;
   }
 
   public static class DefenseArm {