From a1a9b30f13fb48eb61ed8dc5f845e5caa381baac Mon Sep 17 00:00:00 2001 From: roeibustein Date: Thu, 28 Jan 2016 19:36:42 -0800 Subject: [PATCH] write methods getArmAngle and getHandAngle --- .../frc/team3501/robot/subsystems/DefenseArm.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java index 33fb5f92..562fe63f 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java @@ -30,15 +30,16 @@ public class DefenseArm extends Subsystem { public DefenseArm() { defenseArmPotentiometer = new AnalogPotentiometer( - Constants.DefenseArm.ARM_CHANNEL, - FULL_RANGE, OFFSET); + Constants.DefenseArm.ARM_CHANNEL, FULL_RANGE, OFFSET); + defenseArmMotor = new CANTalon(Constants.DefenseArm.ARM_PORT); defenseHandMotor = new CANTalon(Constants.DefenseArm.HAND_PORT); } /*** - * This method gets the height of the hook from the ground. The hook is - * attached to the end of the hand, which is attached to the arm. + * <<<<<<< Updated upstream This method gets the height of the hook from the + * ground. The hook is attached to the end of the hand, which is attached to + * the arm. * * @return hookHeight gets height of hook from ground. The hook is attached to * the end of the hand, which is attached the arm. The height is in @@ -64,6 +65,7 @@ public class DefenseArm extends Subsystem { public double getFootHeight() { return footHeight; + } @Override -- 2.30.2