change method getArmHorizontalDist to getArmHorizontalDisplacement

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / subsystems / DefenseArm.java

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;
   }