From: Meryem Esa <meresa14@gmail.com>
Date: Sat, 30 Jan 2016 23:53:12 +0000 (-0800)
Subject: delete Align command and rename Aim to AimAndAlign
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=2c0fdbbab823d8a1aad45c0816227cf505a4419e

delete Align command and rename Aim to AimAndAlign
---

diff --git a/src/org/usfirst/frc/team3501/robot/commands/Aim.java b/src/org/usfirst/frc/team3501/robot/commands/Aim.java
deleted file mode 100755
index b4c9f212..00000000
--- a/src/org/usfirst/frc/team3501/robot/commands/Aim.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-public class Aim extends Command {
-
-	public Aim() {
-	}
-
-	@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/AimAndAlign.java b/src/org/usfirst/frc/team3501/robot/commands/AimAndAlign.java
new file mode 100755
index 00000000..72819405
--- /dev/null
+++ b/src/org/usfirst/frc/team3501/robot/commands/AimAndAlign.java
@@ -0,0 +1,30 @@
+package org.usfirst.frc.team3501.robot.commands;
+
+import edu.wpi.first.wpilibj.command.Command;
+
+public class AimAndAlign extends Command {
+
+	public AimAndAlign() {
+	}
+
+	@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/Align.java b/src/org/usfirst/frc/team3501/robot/commands/Align.java
deleted file mode 100755
index 3d28b696..00000000
--- a/src/org/usfirst/frc/team3501/robot/commands/Align.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-public class Align extends Command {
-
-	public Align() {
-	}
-
-	@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/DefaultAutonStrategy.java b/src/org/usfirst/frc/team3501/robot/commands/DefaultAutonStrategy.java
index eccd9668..2e6d8eca 100755
--- a/src/org/usfirst/frc/team3501/robot/commands/DefaultAutonStrategy.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/DefaultAutonStrategy.java
@@ -57,7 +57,7 @@ public class DefaultAutonStrategy extends CommandGroup {
 
     // TODO: put in the argument that goes inside of aim, based on the position
     // variable that was passed into the command group
-    addSequential(new Aim());
+    addSequential(new AimAndAlign());
     addSequential(new Shoot());
 
   }