create separate arrays to hold potentiometer angles for hand and arm and add separate...

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java.orig b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java.orig
index 0ef15c93b929bde08b857ec977afdbef2d27452b..20d8a3d00abc42a8ed500af97f018a5d3db584f8 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java.orig
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java.orig
@@ -13,12 +13,8 @@ public class DefenseArm extends Subsystem {
   private CANTalon defenseHand;
   private double hookHeight;
   private double footHeight;
-<<<<<<< HEAD
   private double[] potHandAngles;
   private double[] potArmAngles;
-=======
-  private double[] potAngles = { 0, 45, 90 };
->>>>>>> Fix some errors
 
   // angles corresponding to pre-determined heights we will need
 
@@ -34,11 +30,8 @@ public class DefenseArm extends Subsystem {
 
     defenseArm = new CANTalon(Constants.DefenseArm.ARM_PORT);
     defenseHand = new CANTalon(Constants.DefenseArm.HAND_PORT);
-<<<<<<< HEAD
     potHandAngles = createHandPotArray();
     potArmAngles = createArmPotArray();
-=======
->>>>>>> Fix some errors
   }
 
   public double getArmPotAngle() {
@@ -61,6 +54,9 @@ public class DefenseArm extends Subsystem {
    *         the angle of the arm corresponding to that arm location
    */
 <<<<<<< HEAD
+=======
+
+>>>>>>> create separate arrays to hold potentiometer angles for hand and arm and add separate methods for both angle arrays
   public double getAngleForHandLocation(int desiredArmLocation) {
     return potHandAngles[desiredArmLocation];
   }
@@ -85,13 +81,6 @@ public class DefenseArm extends Subsystem {
       arr[i] = 45 * i;
     }
     return arr;
-=======
-  public double getLevelValue(int level) {
-    if (level >= potAngles.length)
-      return potAngles[level];
-    else
-      return 0;
->>>>>>> Fix some errors
   }
 
   /***