From: Yamini Adusumelli Date: Fri, 29 Jan 2016 03:16:11 +0000 (-0800) Subject: delete defense hand potentiometer X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=dac91bffe7e85bdb15f37db44e732d6580d1e2d4 delete defense hand potentiometer --- diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java index 8e495089..7e57dbe2 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java @@ -13,6 +13,7 @@ public class DefenseArm extends Subsystem { public CANTalon defenseArmMotor; public CANTalon defenseHandMotor; public double hookHeight; + public double footHeight; // Defense arm specific constants that relate to the degrees per pulse value // for the potentiometers @@ -31,7 +32,6 @@ public class DefenseArm extends Subsystem { defenseArmPotentiometer = new AnalogPotentiometer( Constants.DefenseArm.ARM_CHANNEL, FULL_RANGE, OFFSET); - Constants.DefenseArm.HAND_CHANNEL); defenseArmMotor = new CANTalon(Constants.DefenseArm.ARM_PORT); defenseHandMotor = new CANTalon(Constants.DefenseArm.HAND_PORT); } @@ -39,16 +39,22 @@ public class DefenseArm extends Subsystem { /*** * 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. - * + * */ public double getHookHeight() { + return hookHeight; } + public double getFootHeight() { + + return footHeight; + } + @Override protected void initDefaultCommand() { }