add four method stubs

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
index 562fe63f9c47efd23023babbdb68699b719d66f2..b54a02f291616aba166a078a7833a5c9887a6a32 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
@@ -8,12 +8,12 @@ import edu.wpi.first.wpilibj.command.Subsystem;
 \r
 public class DefenseArm extends Subsystem {\r
   // Defense arm related objects\r
-  public AnalogPotentiometer defenseArmPotentiometer;\r
-  public AnalogPotentiometer defenseHandPotentiometer;\r
-  public CANTalon defenseArmMotor;\r
-  public CANTalon defenseHandMotor;\r
-  public double hookHeight;\r
-  public double footHeight;\r
+  private AnalogPotentiometer defenseArmPotentiometer;\r
+  private AnalogPotentiometer defenseHandPotentiometer;\r
+  private CANTalon defenseArmMotor;\r
+  private CANTalon defenseHandMotor;\r
+  private double hookHeight;\r
+  private double footHeight;\r
 \r
   // Defense arm specific constants that relate to the degrees per pulse value\r
   // for the potentiometers\r
@@ -37,7 +37,7 @@ public class DefenseArm extends Subsystem {
   }\r
 \r
   /***\r
-   * <<<<<<< Updated upstream This method gets the height of the hook from the\r
+   * This method gets the height of the hook from the\r
    * ground. The hook is attached to the end of the hand, which is attached to\r
    * the arm.\r
    *\r
@@ -49,7 +49,7 @@ public class DefenseArm extends Subsystem {
 \r
   public double getHookHeight() {\r
 \r
-    return hookHeight;\r
+    return 0;\r
   }\r
 \r
   /***\r
@@ -63,9 +63,34 @@ public class DefenseArm extends Subsystem {
    */\r
 \r
   public double getFootHeight() {\r
+    return 0;\r
+  }\r
+\r
+  /***\r
+   * This method sets the voltage of the arm motor. The range is from [-1,1]. A\r
+   * negative voltage makes the direction of the motor go backwards.\r
+   *\r
+   * @param speed\r
+   *          The voltage that you set the motor at. The range of the voltage of\r
+   *          the arm motor is from [-1,1]. A\r
+   *          negative voltage makes the direction of the motor go backwards.\r
+   */\r
+\r
+  public void setArmMotorSpeed(double speed) {\r
 \r
-    return footHeight;\r
+  }\r
+\r
+  /***\r
+   * This method sets the voltage of the hand motor. The range is from [-1,1]. A\r
+   * negative voltage makes the direction of the motor go backwards.\r
+   *\r
+   * @param speed\r
+   *          The voltage that you set the motor at. The range of the voltage of\r
+   *          the hand motor is from [-1,1]. A\r
+   *          negative voltage makes the direction of the motor go backwards.\r
+   */\r
 \r
+  public void setHandMotorSpeed(double speed) {\r
   }\r
 \r
   @Override\r