construct defenseHandPotentiometer
authorShaina Chen <shaina.sierra@gmail.com>
Fri, 5 Feb 2016 02:37:27 +0000 (18:37 -0800)
committerShaina Chen <shaina.sierra@gmail.com>
Fri, 5 Feb 2016 04:21:28 +0000 (20:21 -0800)
src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java

index a5bb51760298edd13189af41f62018af578d9c72..3c6309b474d1ca48c33e57a87193972881f7ea18 100755 (executable)
@@ -13,16 +13,22 @@ public class DefenseArm extends Subsystem {
   private CANTalon defenseHand;
   private double hookHeight;
   private double footHeight;
-  private Double[] potAngles;
+  private double[] potAngles;
+  // angles corresponding to pre-determined heights we will need
 
   public DefenseArm() {
     defenseArmPotentiometer = new AnalogPotentiometer(
         Constants.DefenseArm.ARM_CHANNEL,
         Constants.DefenseArm.FULL_RANGE,
         Constants.DefenseArm.OFFSET);
+    defenseHandPotentiometer = new AnalogPotentiometer(
+        Constants.DefenseArm.HAND_CHANNEL,
+        Constants.DefenseArm.FULL_RANGE,
+        Constants.DefenseArm.OFFSET);
 
     defenseArm = new CANTalon(Constants.DefenseArm.ARM_PORT);
     defenseHand = new CANTalon(Constants.DefenseArm.HAND_PORT);
+    potAngles = createPotArray();
   }
 
   public double getArmPotAngle() {
@@ -37,11 +43,13 @@ public class DefenseArm extends Subsystem {
     return potAngles[desiredArmLocation];
   }
 
-  public Double[] putInValues() {
+  public double[] createPotArray() {
+    double[] arr = new double[3];
+
     for (int i = 0; i < 3; i++) {
-      potAngles[i] = (double) (45 * i);
+      arr[i] = 45 * i;
     }
-    return potAngles;
+    return arr;
   }
 
   /***