From: EvanYap <evanyap.14@gmail.com>
Date: Tue, 16 Feb 2016 02:01:47 +0000 (-0800)
Subject: Rename word Up to Continious and rename word Intake to Defense
X-Git-Url: http://challenge-bot.com/repos/?a=commitdiff_plain;h=04a9c06e8abfed5ae854708eb3dacef9b5d85660;p=3501%2Fstronghold-2016

Rename word Up to Continious and rename word Intake to Defense
---

diff --git a/src/org/usfirst/frc/team3501/robot/commands/defensearm/MoveDefenseArmContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/defensearm/MoveDefenseArmContinuous.java
new file mode 100644
index 00000000..e47bd5b1
--- /dev/null
+++ b/src/org/usfirst/frc/team3501/robot/commands/defensearm/MoveDefenseArmContinuous.java
@@ -0,0 +1,30 @@
+package org.usfirst.frc.team3501.robot.commands.defensearm;
+
+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/defensearm/MoveDefenseArmToAngle.java b/src/org/usfirst/frc/team3501/robot/commands/defensearm/MoveDefenseArmToAngle.java
new file mode 100644
index 00000000..77023dd7
--- /dev/null
+++ b/src/org/usfirst/frc/team3501/robot/commands/defensearm/MoveDefenseArmToAngle.java
@@ -0,0 +1,59 @@
+package org.usfirst.frc.team3501.robot.commands.defensearm;
+
+import org.usfirst.frc.team3501.robot.Robot;
+
+import edu.wpi.first.wpilibj.command.Command;
+
+public class MoveIntakeArmToAngle extends Command {
+	private double currentAngle;
+	private double targetAngle;
+	private double targetSpeed;
+	private double SENSITIVITY_THRESHOLD = 0.1;
+	private boolean isDecreasing = false;
+
+	public MoveIntakeArmToAngle(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/defensearm/MoveIntakeArmToAngle.java b/src/org/usfirst/frc/team3501/robot/commands/defensearm/MoveIntakeArmToAngle.java
deleted file mode 100644
index 77023dd7..00000000
--- a/src/org/usfirst/frc/team3501/robot/commands/defensearm/MoveIntakeArmToAngle.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.defensearm;
-
-import org.usfirst.frc.team3501.robot.Robot;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-public class MoveIntakeArmToAngle extends Command {
-	private double currentAngle;
-	private double targetAngle;
-	private double targetSpeed;
-	private double SENSITIVITY_THRESHOLD = 0.1;
-	private boolean isDecreasing = false;
-
-	public MoveIntakeArmToAngle(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/defensearm/MoveIntakeArmUp.java b/src/org/usfirst/frc/team3501/robot/commands/defensearm/MoveIntakeArmUp.java
deleted file mode 100644
index 437d04b7..00000000
--- a/src/org/usfirst/frc/team3501/robot/commands/defensearm/MoveIntakeArmUp.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.defensearm;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-public class MoveIntakeArmUp extends Command {
-
-  public MoveIntakeArmUp() {
-  }
-
-  @Override
-  protected void initialize() {
-  }
-
-  @Override
-  protected void execute() {
-  }
-
-  @Override
-  protected boolean isFinished() {
-    return false;
-  }
-
-  @Override
-  protected void end() {
-  }
-
-  @Override
-  protected void interrupted() {
-  }
-}