From 56c148bd962f3aadfc4595bb5473fa7d18e55b78 Mon Sep 17 00:00:00 2001 From: Cindy Zhang Date: Thu, 11 Feb 2016 19:34:36 -0800 Subject: [PATCH] change method getArmHeight to getArmVerticalDisplacement --- notes/cindy.org | 4 ++-- src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/notes/cindy.org b/notes/cindy.org index 09b35857..00acb0c0 100644 --- 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 020d51b3..401f09e4 100755 --- 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()); -- 2.30.2