From 28a012b66c31636b7982989bc219bb41631bf04c Mon Sep 17 00:00:00 2001 From: Shaina Chen Date: Thu, 4 Feb 2016 19:40:35 -0800 Subject: [PATCH] change intake and chevalDeFriseHand CANTalon variable names to intakeRoller and intakeArm --- .../frc/team3501/robot/subsystems/IntakeArm.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java index a69a9845..e66fe08e 100755 --- 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); } /*** -- 2.30.2