From: Cindy Zhang <cindyzyx9@gmail.com>
Date: Fri, 12 Feb 2016 03:31:59 +0000 (-0800)
Subject: change variables arm and hand to armHorizontalDisplacement and armVerticalDisplacemen... 
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=bf83e12d8337bcb9e5f0e63e6bb265c045607124

change variables arm and hand to armHorizontalDisplacement and armVerticalDisplacement and handHorizontalDisplacement and handVerticalDisplacement
---

diff --git a/notes/cindy.org b/notes/cindy.org
index 66155f7a..8464b6f4 100644
--- a/notes/cindy.org
+++ b/notes/cindy.org
@@ -10,5 +10,8 @@
   * for getArmHorizontalDisplacement figure out if measurements are all in 
     inches
 * doing
+  * change arm and hand to "armHorizontal/armVertical" and "handHorizontal/
+    handVertical"
+* done
   * code review
-* done
\ No newline at end of file
+  
\ No newline at end of file
diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
index 6bb409c0..93dfc0ba 100755
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
@@ -97,18 +97,20 @@ public class DefenseArm extends Subsystem {
 
   // TODO: figure out if measurements are all in inches
   public double getArmHorizontalDist() {
-    double arm = Constants.DefenseArm.ARM_LENGTH * Math.cos(getArmPotAngle());
-    double hand = Constants.DefenseArm.HAND_LENGTH
+    double armHorizontalDisplacement = Constants.DefenseArm.ARM_LENGTH
+        * Math.cos(getArmPotAngle());
+    double handHorizontalDisplacement = Constants.DefenseArm.HAND_LENGTH
         * Math.cos(getHandPotAngle());
-    return (arm + hand);
+    return (armHorizontalDisplacement + handHorizontalDisplacement);
   }
 
   public double getArmHeight() {
     double armMounted = Constants.DefenseArm.ARM_MOUNTED_HEIGHT;
-    double arm = Constants.DefenseArm.ARM_LENGTH * Math.sin(getArmPotAngle());
-    double hand = Constants.DefenseArm.HAND_LENGTH
+    double armVerticalDisplacement = Constants.DefenseArm.ARM_LENGTH
+        * Math.sin(getArmPotAngle());
+    double handVerticalDisplacement = Constants.DefenseArm.HAND_LENGTH
         * Math.sin(getHandPotAngle());
-    return (armMounted + arm + hand);
+    return (armMounted + armVerticalDisplacement + handVerticalDisplacement);
   }
 
   public boolean isOutsideRange() {