From: Kevin Zhang Date: Thu, 11 Feb 2016 04:02:41 +0000 (-0800) Subject: Fix some errors X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=28ad5f35ce7254ee65c1b0cc5fa198a21df41efd Fix some errors --- diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java index 81365c88..9b745760 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java @@ -13,7 +13,8 @@ public class DefenseArm extends Subsystem { private CANTalon defenseHand; private double hookHeight; private double footHeight; - private double[] potAngles; + private double[] potAngles = { 0, 45, 90 }; + // angles corresponding to pre-determined heights we will need public DefenseArm() { @@ -28,7 +29,6 @@ public class DefenseArm extends Subsystem { defenseArm = new CANTalon(Constants.DefenseArm.ARM_PORT); defenseHand = new CANTalon(Constants.DefenseArm.HAND_PORT); - potAngles = createPotArray(); } public double getArmPotAngle() { @@ -50,17 +50,11 @@ public class DefenseArm extends Subsystem { * @return * the angle of the arm corresponding to that arm location */ - public double getAngleForLocation(int desiredArmLocation) { - return potAngles[desiredArmLocation]; - } - - public double[] createPotArray() { - double[] arr = new double[3]; - - for (int i = 0; i < 3; i++) { - arr[i] = 45 * i; - } - return arr; + public double getLevelValue(int level) { + if (level >= potAngles.length) + return potAngles[level]; + else + return 0; } /***