change intake arm constant names

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index bb7ceba088c1bca22bcb8e2acb38e3dc5b636a03..68bbb0d9ec3ca62e150808998690c1adaf97d270 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -63,8 +63,8 @@ public class Constants {
   }
 
   public static class IntakeArm {
-    public static final int PORT = 0;
-    public static final int CHEVAL_DE_FRISE_HAND_PORT = 1;
+    public static final int ROLLER_PORT = 0;
+    public static final int INTAKE_PORT = 1;
 
     public static final double INTAKE_SPEED = 0.5;
     public static final double OUTPUT_SPEED = -0.5;

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
index 7140b83e799908f173e6229711a164b778cf0aff..4f3daa6be6b130664ec00a16333b97308b26d977 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
@@ -24,8 +24,8 @@ public class IntakeArm extends Subsystem {
   private AnalogPotentiometer intakePot;
 
   public IntakeArm() {
-    intakeRoller = new CANTalon(Constants.IntakeArm.PORT);
-    intakeArm = new CANTalon(Constants.IntakeArm.CHEVAL_DE_FRISE_HAND_PORT);
+    intakeRoller = new CANTalon(Constants.IntakeArm.ROLLER_PORT);
+    intakeArm = new CANTalon(Constants.IntakeArm.INTAKE_PORT);
   }
 
   /*