change intake and chevalDeFriseHand CANTalon variable names to intakeRoller and intakeArm

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / subsystems / IntakeArm.java

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
index a69a9845ce418d48e133657cc56554ccebf9396d..e66fe08e589cb3a18dbaa2091963dfa1f49e52ed 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
@@ -18,12 +18,12 @@ import edu.wpi.first.wpilibj.command.Subsystem;
  */
 
 public class IntakeArm extends Subsystem {
-  private CANTalon intake;
-  private CANTalon chevalDeFriseHand;
+  private CANTalon intakeRoller;
+  private CANTalon intakeArm;
 
   public IntakeArm() {
-    intake = new CANTalon(Constants.IntakeArm.PORT);
-    chevalDeFriseHand = new CANTalon(Constants.IntakeArm.CHEVAL_DE_FRISE_HAND_PORT);
+    intakeRoller = new CANTalon(Constants.IntakeArm.PORT);
+    intakeArm = new CANTalon(Constants.IntakeArm.CHEVAL_DE_FRISE_HAND_PORT);
   }
 
   /*
@@ -34,15 +34,15 @@ public class IntakeArm extends Subsystem {
    * Must be used in a command that has a timer variable to stop it.
    */
   public void dropIntake() {
-    intake.set(0.3);
+    intakeRoller.set(0.3);
   }
 
   public void intake() {
-    intake.set(Constants.IntakeArm.INTAKE_SPEED);
+    intakeRoller.set(Constants.IntakeArm.INTAKE_SPEED);
   }
 
   public void output() {
-    intake.set(Constants.IntakeArm.OUTPUT_SPEED);
+    intakeRoller.set(Constants.IntakeArm.OUTPUT_SPEED);
   }
 
   /***