change method getArmHorizontalDist to getArmHorizontalDisplacement

diff --git a/notes/cindy.org b/notes/cindy.org
index 8464b6f44bc69215bb5e593b462637ddfe33f8c5..09b35857c34fd215428eafa39d49911897413b05 100644 (file)
--- a/notes/cindy.org
+++ b/notes/cindy.org
@@ -3,15 +3,14 @@
     relative to that
   * find out actual arm and hand length, as well as the height at which the arm
     is mounted
-  * change arm and hand to "armHorizontal/armVertical" and "handHorizontal/
-    handVertical"
   * change method "getArmHorizontalDist" to "getArmHorizontalDisplacement"
   * change method "getArmHeight" to "getArmVerticalDisplacement"
   * for getArmHorizontalDisplacement figure out if measurements are all in 
     inches
 * doing
-  * change arm and hand to "armHorizontal/armVertical" and "handHorizontal/
-    handVertical"
+  * change method "getArmHorizontalDist" to "getArmHorizontalDisplacement"
 * done
   * code review
+  * change arm and hand to "armHorizontal/armVertical" and "handHorizontal/
+    handVertical"
   
\ 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 93dfc0ba339999304f6b4d32fa568c7f76be94a8..020d51b3ab5c396b12c8d5507ca89f03f60ca06f 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
@@ -96,7 +96,7 @@ public class DefenseArm extends Subsystem {
   }
 
   // TODO: figure out if measurements are all in inches
-  public double getArmHorizontalDist() {
+  public double getArmHorizontalDisplacement() {
     double armHorizontalDisplacement = Constants.DefenseArm.ARM_LENGTH
         * Math.cos(getArmPotAngle());
     double handHorizontalDisplacement = Constants.DefenseArm.HAND_LENGTH
@@ -114,7 +114,7 @@ public class DefenseArm extends Subsystem {
   }
 
   public boolean isOutsideRange() {
-    if (getArmHorizontalDist() < 15)
+    if (getArmHorizontalDisplacement() < 15)
       return false;
     return true;
   }