From: Garima Kapila <garima.kapila369@gmail.com>
Date: Sun, 31 Jan 2016 01:02:44 +0000 (-0800)
Subject: change name of cheval de frise port in constants class within intake arm
X-Git-Url: http://challenge-bot.com/repos/?a=commitdiff_plain;h=c4e71803cac46bfa52182a89606fc7c8344f2be3;p=3501%2Fstronghold-2016

change name of cheval de frise port in constants class within intake arm
---

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index c26a8809..e20ecc9c 100644
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -59,7 +59,7 @@ public class Constants {
 
   public static class IntakeArm {
     public static final int PORT = 0;
-    public static final int CHEVAL_DE_FRISE_PORT = 1;
+    public static final int CHEVAL_DE_FRISE_HAND_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 33165b32..dc784e5b 100755
--- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
@@ -12,7 +12,7 @@ public class IntakeArm extends Subsystem {
 
   public IntakeArm() {
     intake = new CANTalon(Constants.IntakeArm.PORT);
-    chevalDeFriseHand = new CANTalon(Constants.IntakeArm.CHEVAL_DE_FRISE_PORT);
+    chevalDeFriseHand = new CANTalon(Constants.IntakeArm.CHEVAL_DE_FRISE_HAND_PORT);
   }
 
   /*