Rename ExecuteDoubleMacro

Author: minchingtonak

src/org/usfirst/frc/team226/robot/Robot.java

@@ -55,9 +55,9 @@ public void robotInit() {
 		intake = new Intake();
 		oi = new OI();
 		chooser.addDefault("Baseline Cross", new ExecuteMacro("baseline"));
-		chooser.addObject("Left Switch", new ExecuteDoubleMacro("left", "baseline"));
-		chooser.addObject("Center Switch", new ExecuteDoubleMacro("centerswitch_left", "centerswitch_right"));
-		chooser.addObject("Right Switch", new ExecuteDoubleMacro("baseline", "rightswitch_right"));
+		chooser.addObject("Left Switch", new ExecuteChoiceMacro("leftswitch_left", "baseline"));
+		chooser.addObject("Center Switch", new ExecuteChoiceMacro("centerswitch_left", "centerswitch_right"));
+		chooser.addObject("Right Switch", new ExecuteChoiceMacro("baseline", "rightswitch_right"));
 		SmartDashboard.putData("Auto mode", chooser);
 
 		SmartDashboard.putData(new PS_ShiftDriveTrainHighGear());

src/org/usfirst/frc/team226/robot/auton/ExecuteDoubleMacro.java renamed to src/org/usfirst/frc/team226/robot/auton/ExecuteChoiceMacro.java

@@ -15,7 +15,7 @@
 /**
  *
  */
-public class ExecuteDoubleMacro extends Command {
+public class ExecuteChoiceMacro extends Command {
 
 	private String leftName;
 	private String rightName;
@@ -24,7 +24,7 @@ public class ExecuteDoubleMacro extends Command {
 
 	private TalonSRX[] talons = Robot.driveTrain.getMotionProfileTalons();
 
-    public ExecuteDoubleMacro(String leftName, String rightName) {
+    public ExecuteChoiceMacro(String leftName, String rightName) {
         // Use requires() here to declare subsystem dependencies
         // eg. requires(chassis);
     	requires(Robot.driveTrain);
@@ -61,7 +61,7 @@ protected void execute() {
 
     // Make this return true when this Command no longer needs to run execute()
     protected boolean isFinished() {
-        return false;
+        return profileToExecute.isFinished() && actionListToExecute.isFinished();
     }
 
     // Called once after isFinished returns true