write methods getArmAngle and getHandAngle

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
index 33fb5f927aa91cd0b1457bca188079117bd9e33b..562fe63f9c47efd23023babbdb68699b719d66f2 100755 (executable)
--- 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 {
 \r
   public DefenseArm() {\r
     defenseArmPotentiometer = new AnalogPotentiometer(\r
-        Constants.DefenseArm.ARM_CHANNEL,\r
-        FULL_RANGE, OFFSET);\r
+        Constants.DefenseArm.ARM_CHANNEL, FULL_RANGE, OFFSET);\r
+\r
     defenseArmMotor = new CANTalon(Constants.DefenseArm.ARM_PORT);\r
     defenseHandMotor = new CANTalon(Constants.DefenseArm.HAND_PORT);\r
   }\r
 \r
   /***\r
-   * This method gets the height of the hook from the ground. The hook is\r
-   * attached to the end of the hand, which is attached to the arm.\r
+   * <<<<<<< Updated upstream This method gets the height of the hook from the\r
+   * ground. The hook is attached to the end of the hand, which is attached to\r
+   * the arm.\r
    *\r
    * @return hookHeight gets height of hook from ground. The hook is attached to\r
    *         the end of the hand, which is attached the arm. The height is in\r
@@ -64,6 +65,7 @@ public class DefenseArm extends Subsystem {
   public double getFootHeight() {\r
 \r
     return footHeight;\r
+\r
   }\r
 \r
   @Override\r