delete second potentiometer for defense hand

[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 c807f558e9541e94aea62d0c6fcf26cd4f9c42f6..8e49508981cc1bc5d7a2444787b567b421758b5f 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
@@ -8,30 +8,45 @@ import edu.wpi.first.wpilibj.command.Subsystem;
 \r
 public class DefenseArm extends Subsystem {\r
   // Defense arm related objects\r
-  private AnalogPotentiometer potentiometer;\r
-  private CANTalon defenseArmMotor;\r
+  public AnalogPotentiometer defenseArmPotentiometer;\r
+  public AnalogPotentiometer defenseHandPotentiometer;\r
+  public CANTalon defenseArmMotor;\r
+  public CANTalon defenseHandMotor;\r
+  public double hookHeight;\r
 \r
   // Defense arm specific constants that relate to the degrees per pulse value\r
   // for the potentiometers\r
-  private final static double PULSES_PER_ROTATION = 1; // in pulses\r
-  private final static double FULL_RANGE = 270.0; // in degrees\r
-  private final static double OFFSET = -135.0; // in degrees\r
-  private Double[] levelsToDegrees = { 0.0, 45.0, 90.0 }; // 3 level array;\r
-  // angles at 0,45,90\r
+  // private final static double PULSES_PER_ROTATION = 1; // in pulses\r
+  public final static double FULL_RANGE = 270.0; // in degrees\r
+  public final static double OFFSET = -135.0; // in degrees\r
+  public final static double[] armPotValue = { 0.0, 45.0, 90.0 }; // 3 level\r
+\r
+  // array;\r
+\r
+  // do we want to use a hashmap??\r
+  // angles at 0,45,90 (Potentiometer value readings)\r
   // degrees\r
 \r
   public DefenseArm() {\r
-    potentiometer = new AnalogPotentiometer(Constants.DefenseArm.CHANNEL,\r
+    defenseArmPotentiometer = new AnalogPotentiometer(\r
+        Constants.DefenseArm.ARM_CHANNEL,\r
         FULL_RANGE, OFFSET);\r
-    defenseArmMotor = new CANTalon(Constants.DefenseArm.DEFENSE_ARM_MOTOR);\r
+    Constants.DefenseArm.HAND_CHANNEL);\r
+    defenseArmMotor = new CANTalon(Constants.DefenseArm.ARM_PORT);\r
+    defenseHandMotor = new CANTalon(Constants.DefenseArm.HAND_PORT);\r
   }\r
 \r
-  public double getDistance(int desiredArmLocation) {\r
-    return levelsToDegrees[desiredArmLocation];\r
-  }\r
-\r
-  public void moveArmTo() {\r
-\r
+  /***\r
+   * This method gets the height of the hook from the ground. The hook is\r
+   * attached to the end of the hand, which is attached to the arm.\r
+   * \r
+   * @return hookHeight gets height of hook from ground. The hook is attached to\r
+   *         the end of the hand, which is attached the arm.\r
+   * \r
+   */\r
+\r
+  public double getHookHeight() {\r
+    return hookHeight;\r
   }\r
 \r
   @Override\r