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 (executable)
index b4c9f21..0000000
--- 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 (executable)
index 0000000..7281940
--- /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 (executable)
index 3d28b69..0000000
--- 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 eccd96682b860470712f53154f6b85aa9e909acf..2e6d8eca9c75e7a0a9aedf21624700675f73c92b 100755 (executable)
--- 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());
 
   }