From: Shaina Chen <shaina.sierra@gmail.com>
Date: Fri, 5 Feb 2016 04:19:54 +0000 (-0800)
Subject: change intake arm constant names
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=a7e06736b721bf00ec3dd1ec26f0172bd19e7d05

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 bb7ceba0..68bbb0d9 100644
--- 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 7140b83e..4f3daa6b 100755
--- 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);
   }
 
   /*