rename all classes to have DoubleJointed next to DefenseArm
authorEvanYap <evanyap.14@gmail.com>
Tue, 16 Feb 2016 01:59:33 +0000 (17:59 -0800)
committerEvanYap <evanyap.14@gmail.com>
Tue, 16 Feb 2016 01:59:33 +0000 (17:59 -0800)
18 files changed:
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/LowerDefenseArmContinuous.java [deleted file]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/LowerDefenseWristContinuous.java [deleted file]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/LowerDoubleJointedDefenseArmContinuous.java [new file with mode: 0755]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/LowerDoubleJointedDefenseWristContinuous.java [new file with mode: 0755]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/MoveDefenseArmContinuous.java [deleted file]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/MoveDefenseArmToAngle.java [deleted file]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/MoveDoubleJointedDefenseArmContinuous.java [new file with mode: 0644]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/MoveDoubleJointedDefenseArmToAngle.java [new file with mode: 0644]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RaiseDefenseArmContinuous.java [deleted file]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RaiseDefenseWristContinuous.java [deleted file]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RaiseDoubleJointedDefenseArmContinuous.java [new file with mode: 0755]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RaiseDoubleJointedDefenseWristContinuous.java [new file with mode: 0755]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RetractDefenseArm.java [deleted file]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RetractDoubleJointedDefenseArm.java [new file with mode: 0755]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/SeDoubleJointedDefensetArmToAngle.java [new file with mode: 0755]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/SetArmToAngle.java [deleted file]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/SetDoubleJointedHandToAngle.java [new file with mode: 0755]
src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/SetHandToAngle.java [deleted file]

diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/LowerDefenseArmContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/LowerDefenseArmContinuous.java
deleted file mode 100755 (executable)
index fc1d7bf..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
-
-import org.usfirst.frc.team3501.robot.Robot;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-/***
- * This command is intended to be run from OI using button.whileHeld(...).
- * It lowers the defenseArm continually while the button is being held down.
- * 
- * @author shaina
- *
- */
-public class LowerDefenseArmContinuous extends Command {
-
-  private double speed;
-
-  public LowerDefenseArmContinuous(double speed) {
-    requires(Robot.defenseArm);
-    this.speed = -speed;
-  }
-
-  @Override
-  protected void initialize() {
-    Robot.defenseArm.setArmSpeed(speed);
-  }
-
-  @Override
-  protected void execute() {
-  }
-
-  @Override
-  protected boolean isFinished() {
-    return true;
-  }
-
-  @Override
-  protected void end() {
-    Robot.defenseArm.setArmSpeed(0);
-  }
-
-  @Override
-  protected void interrupted() {
-    end();
-  }
-}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/LowerDefenseWristContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/LowerDefenseWristContinuous.java
deleted file mode 100755 (executable)
index 748e10d..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
-
-import org.usfirst.frc.team3501.robot.Robot;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-/***
- * This command is intended to be run from OI using button.whileHeld(...).
- * It lowers the defenseWrist continually while the button is being held down.
- *
- * @author shaina
- *
- */
-public class LowerDefenseWristContinuous extends Command {
-
-  private double speed;
-
-  public LowerDefenseWristContinuous(double speed) {
-    requires(Robot.defenseArm);
-    this.speed = -speed;
-  }
-
-  @Override
-  protected void initialize() {
-    Robot.defenseArm.setHandSpeed(speed);
-  }
-
-  @Override
-  protected void execute() {
-  }
-
-  @Override
-  protected boolean isFinished() {
-    return true;
-  }
-
-  @Override
-  protected void end() {
-    Robot.defenseArm.setHandSpeed(0);
-  }
-
-  @Override
-  protected void interrupted() {
-    end();
-  }
-}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/LowerDoubleJointedDefenseArmContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/LowerDoubleJointedDefenseArmContinuous.java
new file mode 100755 (executable)
index 0000000..32ea93f
--- /dev/null
@@ -0,0 +1,46 @@
+package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
+
+import org.usfirst.frc.team3501.robot.Robot;
+
+import edu.wpi.first.wpilibj.command.Command;
+
+/***
+ * This command is intended to be run from OI using button.whileHeld(...).
+ * It lowers the defenseArm continually while the button is being held down.
+ * 
+ * @author shaina
+ *
+ */
+public class LowerDoubleJointedDefenseArmContinuous extends Command {
+
+  private double speed;
+
+  public LowerDoubleJointedDefenseArmContinuous(double speed) {
+    requires(Robot.defenseArm);
+    this.speed = -speed;
+  }
+
+  @Override
+  protected void initialize() {
+    Robot.defenseArm.setArmSpeed(speed);
+  }
+
+  @Override
+  protected void execute() {
+  }
+
+  @Override
+  protected boolean isFinished() {
+    return true;
+  }
+
+  @Override
+  protected void end() {
+    Robot.defenseArm.setArmSpeed(0);
+  }
+
+  @Override
+  protected void interrupted() {
+    end();
+  }
+}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/LowerDoubleJointedDefenseWristContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/LowerDoubleJointedDefenseWristContinuous.java
new file mode 100755 (executable)
index 0000000..6a19384
--- /dev/null
@@ -0,0 +1,46 @@
+package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
+
+import org.usfirst.frc.team3501.robot.Robot;
+
+import edu.wpi.first.wpilibj.command.Command;
+
+/***
+ * This command is intended to be run from OI using button.whileHeld(...).
+ * It lowers the defenseWrist continually while the button is being held down.
+ *
+ * @author shaina
+ *
+ */
+public class LowerDoubleJointedDefenseWristContinuous extends Command {
+
+  private double speed;
+
+  public LowerDoubleJointedDefenseWristContinuous(double speed) {
+    requires(Robot.defenseArm);
+    this.speed = -speed;
+  }
+
+  @Override
+  protected void initialize() {
+    Robot.defenseArm.setHandSpeed(speed);
+  }
+
+  @Override
+  protected void execute() {
+  }
+
+  @Override
+  protected boolean isFinished() {
+    return true;
+  }
+
+  @Override
+  protected void end() {
+    Robot.defenseArm.setHandSpeed(0);
+  }
+
+  @Override
+  protected void interrupted() {
+    end();
+  }
+}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/MoveDefenseArmContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/MoveDefenseArmContinuous.java
deleted file mode 100644 (file)
index bfc4c81..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-public class MoveDefenseArmContinuous extends Command {
-
-  public MoveDefenseArmContinuous() {
-  }
-
-  @Override
-  protected void initialize() {
-  }
-
-  @Override
-  protected void execute() {
-  }
-
-  @Override
-  protected boolean isFinished() {
-    return false;
-  }
-
-  @Override
-  protected void end() {
-  }
-
-  @Override
-  protected void interrupted() {
-  }
-}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/MoveDefenseArmToAngle.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/MoveDefenseArmToAngle.java
deleted file mode 100644 (file)
index 8a77455..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
-
-import org.usfirst.frc.team3501.robot.Robot;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-public class MoveDefenseArmToAngle extends Command {
-       private double currentAngle;
-       private double targetAngle;
-       private double targetSpeed;
-       private double SENSITIVITY_THRESHOLD = 0.1;
-       private boolean isDecreasing = false;
-
-       public MoveDefenseArmToAngle(double angle, double speed) {
-               requires(Robot.intakeArm);
-               targetAngle = angle;
-               targetSpeed = speed;
-
-       }
-
-       @Override
-       protected void initialize() {
-               currentAngle = Robot.intakeArm.getArmAngle();
-               double difference = targetAngle - currentAngle;
-               if (difference > 0) {
-                       Robot.intakeArm.setArmSpeed(targetSpeed);
-                       isDecreasing = true;
-               } else {
-                       Robot.intakeArm.setArmSpeed(-targetSpeed);
-                       isDecreasing = false;
-               }
-       }
-
-       @Override
-       protected void execute() {
-
-       }
-
-       @Override
-       protected boolean isFinished() {
-               currentAngle = Robot.intakeArm.getArmAngle();
-
-               if (isDecreasing == true) {
-                       return (currentAngle <= targetAngle + SENSITIVITY_THRESHOLD);
-               } else {
-                       return (currentAngle >= targetAngle + SENSITIVITY_THRESHOLD);
-               }
-       }
-
-       @Override
-       protected void end() {
-               Robot.intakeArm.stop();
-       }
-
-       @Override
-       protected void interrupted() {
-       }
-
-}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/MoveDoubleJointedDefenseArmContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/MoveDoubleJointedDefenseArmContinuous.java
new file mode 100644 (file)
index 0000000..9871e40
--- /dev/null
@@ -0,0 +1,30 @@
+package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
+
+import edu.wpi.first.wpilibj.command.Command;
+
+public class MoveDoubleJointedDefenseArmContinuous extends Command {
+
+  public MoveDoubleJointedDefenseArmContinuous() {
+  }
+
+  @Override
+  protected void initialize() {
+  }
+
+  @Override
+  protected void execute() {
+  }
+
+  @Override
+  protected boolean isFinished() {
+    return false;
+  }
+
+  @Override
+  protected void end() {
+  }
+
+  @Override
+  protected void interrupted() {
+  }
+}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/MoveDoubleJointedDefenseArmToAngle.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/MoveDoubleJointedDefenseArmToAngle.java
new file mode 100644 (file)
index 0000000..5369324
--- /dev/null
@@ -0,0 +1,59 @@
+package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
+
+import org.usfirst.frc.team3501.robot.Robot;
+
+import edu.wpi.first.wpilibj.command.Command;
+
+public class MoveDoubleJointedDefenseArmToAngle extends Command {
+       private double currentAngle;
+       private double targetAngle;
+       private double targetSpeed;
+       private double SENSITIVITY_THRESHOLD = 0.1;
+       private boolean isDecreasing = false;
+
+       public MoveDoubleJointedDefenseArmToAngle(double angle, double speed) {
+               requires(Robot.intakeArm);
+               targetAngle = angle;
+               targetSpeed = speed;
+
+       }
+
+       @Override
+       protected void initialize() {
+               currentAngle = Robot.intakeArm.getArmAngle();
+               double difference = targetAngle - currentAngle;
+               if (difference > 0) {
+                       Robot.intakeArm.setArmSpeed(targetSpeed);
+                       isDecreasing = true;
+               } else {
+                       Robot.intakeArm.setArmSpeed(-targetSpeed);
+                       isDecreasing = false;
+               }
+       }
+
+       @Override
+       protected void execute() {
+
+       }
+
+       @Override
+       protected boolean isFinished() {
+               currentAngle = Robot.intakeArm.getArmAngle();
+
+               if (isDecreasing == true) {
+                       return (currentAngle <= targetAngle + SENSITIVITY_THRESHOLD);
+               } else {
+                       return (currentAngle >= targetAngle + SENSITIVITY_THRESHOLD);
+               }
+       }
+
+       @Override
+       protected void end() {
+               Robot.intakeArm.stop();
+       }
+
+       @Override
+       protected void interrupted() {
+       }
+
+}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RaiseDefenseArmContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RaiseDefenseArmContinuous.java
deleted file mode 100755 (executable)
index bfc5fce..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
-
-import org.usfirst.frc.team3501.robot.Robot;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-/***
- * This command is intended to be run from OI using button.whileHeld(...).
- * It raises the defenseArm continually while the button is being held down.
- * 
- * @author shaina
- */
-public class RaiseDefenseArmContinuous extends Command {
-
-  private double speed;
-
-  public RaiseDefenseArmContinuous(double speed) {
-    requires(Robot.defenseArm);
-    this.speed = speed;
-  }
-
-  @Override
-  protected void initialize() {
-    Robot.defenseArm.setArmSpeed(speed);
-  }
-
-  @Override
-  protected void execute() {
-  }
-
-  @Override
-  protected boolean isFinished() {
-    return true;
-  }
-
-  @Override
-  protected void end() {
-    Robot.defenseArm.setArmSpeed(0);
-  }
-
-  @Override
-  protected void interrupted() {
-    end();
-  }
-}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RaiseDefenseWristContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RaiseDefenseWristContinuous.java
deleted file mode 100755 (executable)
index 99a16ee..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
-
-import org.usfirst.frc.team3501.robot.Robot;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-/***
- * This command is intended to be run from OI using button.whileHeld(...).
- * It raises the defenseWrist continually while the button is being held down.
- *
- * @author shaina
- *
- */
-public class RaiseDefenseWristContinuous extends Command {
-
-  private double speed;
-
-  public RaiseDefenseWristContinuous(double speed) {
-    requires(Robot.defenseArm);
-    this.speed = speed;
-  }
-
-  @Override
-  protected void initialize() {
-    Robot.defenseArm.setHandSpeed(speed);
-  }
-
-  @Override
-  protected void execute() {
-  }
-
-  @Override
-  protected boolean isFinished() {
-    return true;
-  }
-
-  @Override
-  protected void end() {
-    Robot.defenseArm.setHandSpeed(0);
-  }
-
-  @Override
-  protected void interrupted() {
-    end();
-  }
-}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RaiseDoubleJointedDefenseArmContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RaiseDoubleJointedDefenseArmContinuous.java
new file mode 100755 (executable)
index 0000000..da423e2
--- /dev/null
@@ -0,0 +1,45 @@
+package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
+
+import org.usfirst.frc.team3501.robot.Robot;
+
+import edu.wpi.first.wpilibj.command.Command;
+
+/***
+ * This command is intended to be run from OI using button.whileHeld(...).
+ * It raises the defenseArm continually while the button is being held down.
+ * 
+ * @author shaina
+ */
+public class RaiseDoubleJointedDefenseArmContinuous extends Command {
+
+  private double speed;
+
+  public RaiseDoubleJointedDefenseArmContinuous(double speed) {
+    requires(Robot.defenseArm);
+    this.speed = speed;
+  }
+
+  @Override
+  protected void initialize() {
+    Robot.defenseArm.setArmSpeed(speed);
+  }
+
+  @Override
+  protected void execute() {
+  }
+
+  @Override
+  protected boolean isFinished() {
+    return true;
+  }
+
+  @Override
+  protected void end() {
+    Robot.defenseArm.setArmSpeed(0);
+  }
+
+  @Override
+  protected void interrupted() {
+    end();
+  }
+}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RaiseDoubleJointedDefenseWristContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RaiseDoubleJointedDefenseWristContinuous.java
new file mode 100755 (executable)
index 0000000..bcd3b7f
--- /dev/null
@@ -0,0 +1,46 @@
+package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
+
+import org.usfirst.frc.team3501.robot.Robot;
+
+import edu.wpi.first.wpilibj.command.Command;
+
+/***
+ * This command is intended to be run from OI using button.whileHeld(...).
+ * It raises the defenseWrist continually while the button is being held down.
+ *
+ * @author shaina
+ *
+ */
+public class RaiseDoubleJointedDefenseWristContinuous extends Command {
+
+  private double speed;
+
+  public RaiseDoubleJointedDefenseWristContinuous(double speed) {
+    requires(Robot.defenseArm);
+    this.speed = speed;
+  }
+
+  @Override
+  protected void initialize() {
+    Robot.defenseArm.setHandSpeed(speed);
+  }
+
+  @Override
+  protected void execute() {
+  }
+
+  @Override
+  protected boolean isFinished() {
+    return true;
+  }
+
+  @Override
+  protected void end() {
+    Robot.defenseArm.setHandSpeed(0);
+  }
+
+  @Override
+  protected void interrupted() {
+    end();
+  }
+}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RetractDefenseArm.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RetractDefenseArm.java
deleted file mode 100755 (executable)
index 73b4d6f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
-
-import org.usfirst.frc.team3501.robot.Robot;
-
-import edu.wpi.first.wpilibj.command.CommandGroup;
-
-/***
- * This command group simultaneously move arm and hand to retracted position.
- *
- * @author shaina
- *
- */
-public class RetractDefenseArm extends CommandGroup {
-  static final double ARM_FULLY_RETRACTED_ANGLE = 0; // change value once tested
-  static final double HAND_FULLY_RETRACTED_ANGLE = 0; // change value once
-                                                      // tested
-
-  public RetractDefenseArm(double speed) {
-    requires(Robot.defenseArm);
-
-    addParallel(new SetArmToAngle(speed, ARM_FULLY_RETRACTED_ANGLE));
-    addParallel(new SetHandToAngle(speed, HAND_FULLY_RETRACTED_ANGLE));
-  }
-}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RetractDoubleJointedDefenseArm.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/RetractDoubleJointedDefenseArm.java
new file mode 100755 (executable)
index 0000000..62af006
--- /dev/null
@@ -0,0 +1,24 @@
+package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
+
+import org.usfirst.frc.team3501.robot.Robot;
+
+import edu.wpi.first.wpilibj.command.CommandGroup;
+
+/***
+ * This command group simultaneously move arm and hand to retracted position.
+ *
+ * @author shaina
+ *
+ */
+public class RetractDoubleJointedDefenseArm extends CommandGroup {
+  static final double ARM_FULLY_RETRACTED_ANGLE = 0; // change value once tested
+  static final double HAND_FULLY_RETRACTED_ANGLE = 0; // change value once
+                                                      // tested
+
+  public RetractDoubleJointedDefenseArm(double speed) {
+    requires(Robot.defenseArm);
+
+    addParallel(new SeDoubleJointedDefensetArmToAngle(speed, ARM_FULLY_RETRACTED_ANGLE));
+    addParallel(new SetDoubleJointedHandToAngle(speed, HAND_FULLY_RETRACTED_ANGLE));
+  }
+}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/SeDoubleJointedDefensetArmToAngle.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/SeDoubleJointedDefensetArmToAngle.java
new file mode 100755 (executable)
index 0000000..6b6fb8d
--- /dev/null
@@ -0,0 +1,67 @@
+package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
+
+import org.usfirst.frc.team3501.robot.Robot;
+
+import edu.wpi.first.wpilibj.command.Command;
+
+/***
+ * This command moves the defense arm to a input angle position.
+ * Requires input of a targetPosition and a speed.
+ *
+ * @author shaina
+ *
+ */
+public class SeDoubleJointedDefensetArmToAngle extends Command {
+  private static final double THRESHOLD = 0.1;
+  private double speed;
+  private double targetPosition;
+  private double currentPosition;
+  private boolean isDecreasing = false;
+
+  public SeDoubleJointedDefensetArmToAngle(double speed, double targetPosition) {
+    requires(Robot.defenseArm);
+
+    this.speed = speed;
+    this.targetPosition = targetPosition;
+  }
+
+  @Override
+  public void initialize() {
+    currentPosition = Robot.defenseArm.getArmPotAngle();
+
+    if (currentPosition > targetPosition) {
+      Robot.defenseArm.setArmSpeed(-speed);
+      isDecreasing = true;
+    } else {
+      Robot.defenseArm.setArmSpeed(speed);
+      isDecreasing = false;
+    }
+  }
+
+  @Override
+  public void execute() {
+
+  }
+
+  @Override
+  public boolean isFinished() {
+    currentPosition = Robot.defenseArm.getArmPotAngle();
+
+    if (isDecreasing == true) {
+      return (currentPosition <= targetPosition + THRESHOLD);
+    } else {
+      return (currentPosition >= targetPosition - THRESHOLD);
+    }
+  }
+
+  @Override
+  public void end() {
+    Robot.defenseArm.setArmSpeed(0);
+  }
+
+  @Override
+  protected void interrupted() {
+    end();
+  }
+
+}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/SetArmToAngle.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/SetArmToAngle.java
deleted file mode 100755 (executable)
index d259b9b..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
-
-import org.usfirst.frc.team3501.robot.Robot;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-/***
- * This command moves the defense arm to a input angle position.
- * Requires input of a targetPosition and a speed.
- *
- * @author shaina
- *
- */
-public class SetArmToAngle extends Command {
-  private static final double THRESHOLD = 0.1;
-  private double speed;
-  private double targetPosition;
-  private double currentPosition;
-  private boolean isDecreasing = false;
-
-  public SetArmToAngle(double speed, double targetPosition) {
-    requires(Robot.defenseArm);
-
-    this.speed = speed;
-    this.targetPosition = targetPosition;
-  }
-
-  @Override
-  public void initialize() {
-    currentPosition = Robot.defenseArm.getArmPotAngle();
-
-    if (currentPosition > targetPosition) {
-      Robot.defenseArm.setArmSpeed(-speed);
-      isDecreasing = true;
-    } else {
-      Robot.defenseArm.setArmSpeed(speed);
-      isDecreasing = false;
-    }
-  }
-
-  @Override
-  public void execute() {
-
-  }
-
-  @Override
-  public boolean isFinished() {
-    currentPosition = Robot.defenseArm.getArmPotAngle();
-
-    if (isDecreasing == true) {
-      return (currentPosition <= targetPosition + THRESHOLD);
-    } else {
-      return (currentPosition >= targetPosition - THRESHOLD);
-    }
-  }
-
-  @Override
-  public void end() {
-    Robot.defenseArm.setArmSpeed(0);
-  }
-
-  @Override
-  protected void interrupted() {
-    end();
-  }
-
-}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/SetDoubleJointedHandToAngle.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/SetDoubleJointedHandToAngle.java
new file mode 100755 (executable)
index 0000000..b36a7e8
--- /dev/null
@@ -0,0 +1,67 @@
+package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
+
+import org.usfirst.frc.team3501.robot.Robot;
+
+import edu.wpi.first.wpilibj.command.Command;
+
+/***
+ * This command moves the defense arm to a input angle position.
+ * Requires input of a targetPosition and a speed.
+ * 
+ * @author shaina
+ *
+ */
+public class SetDoubleJointedHandToAngle extends Command {
+  private static final double THRESHOLD = 0.1;
+  private double speed;
+  private double targetPosition;
+  private double currentPosition;
+  private boolean isDecreasing = false;
+
+  public SetDoubleJointedHandToAngle(double speed, double targetPosition) {
+    requires(Robot.defenseArm);
+
+    this.speed = speed;
+    this.targetPosition = targetPosition;
+  }
+
+  @Override
+  public void initialize() {
+    currentPosition = Robot.defenseArm.getHandPotAngle();
+
+    if (currentPosition > targetPosition) {
+      Robot.defenseArm.setArmSpeed(-speed);
+      isDecreasing = true;
+    } else {
+      Robot.defenseArm.setArmSpeed(speed);
+      isDecreasing = false;
+    }
+  }
+
+  @Override
+  public void execute() {
+
+  }
+
+  @Override
+  public boolean isFinished() {
+    currentPosition = Robot.defenseArm.getHandPotAngle();
+
+    if (isDecreasing == true) {
+      return (currentPosition <= targetPosition + THRESHOLD);
+    } else {
+      return (currentPosition >= targetPosition - THRESHOLD);
+    }
+  }
+
+  @Override
+  public void end() {
+    Robot.defenseArm.setArmSpeed(0);
+  }
+
+  @Override
+  protected void interrupted() {
+    end();
+  }
+
+}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/SetHandToAngle.java b/src/org/usfirst/frc/team3501/robot/commands/doublejointeddefensearm/SetHandToAngle.java
deleted file mode 100755 (executable)
index 98f306a..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.doublejointeddefensearm;
-
-import org.usfirst.frc.team3501.robot.Robot;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-/***
- * This command moves the defense arm to a input angle position.
- * Requires input of a targetPosition and a speed.
- * 
- * @author shaina
- *
- */
-public class SetHandToAngle extends Command {
-  private static final double THRESHOLD = 0.1;
-  private double speed;
-  private double targetPosition;
-  private double currentPosition;
-  private boolean isDecreasing = false;
-
-  public SetHandToAngle(double speed, double targetPosition) {
-    requires(Robot.defenseArm);
-
-    this.speed = speed;
-    this.targetPosition = targetPosition;
-  }
-
-  @Override
-  public void initialize() {
-    currentPosition = Robot.defenseArm.getHandPotAngle();
-
-    if (currentPosition > targetPosition) {
-      Robot.defenseArm.setArmSpeed(-speed);
-      isDecreasing = true;
-    } else {
-      Robot.defenseArm.setArmSpeed(speed);
-      isDecreasing = false;
-    }
-  }
-
-  @Override
-  public void execute() {
-
-  }
-
-  @Override
-  public boolean isFinished() {
-    currentPosition = Robot.defenseArm.getHandPotAngle();
-
-    if (isDecreasing == true) {
-      return (currentPosition <= targetPosition + THRESHOLD);
-    } else {
-      return (currentPosition >= targetPosition - THRESHOLD);
-    }
-  }
-
-  @Override
-  public void end() {
-    Robot.defenseArm.setArmSpeed(0);
-  }
-
-  @Override
-  protected void interrupted() {
-    end();
-  }
-
-}