change method getArmHeight to getArmVerticalDisplacement

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