Resurrect dead commits deletd by merge conflict with hersh

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / commands / shooter / Shoot.java

diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/Shoot.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/Shoot.java
index ec5a11d59e9feacbb9ad8930699ad50cd3aefef9..e136c739ae78e74b1da7503258ffa29828fae850 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/commands/shooter/Shoot.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/Shoot.java
@@ -1,30 +1,17 @@
 package org.usfirst.frc.team3501.robot.commands.shooter;
 
-import edu.wpi.first.wpilibj.command.Command;
+import org.usfirst.frc.team3501.robot.commands.auton.AimAndAlign;
 
-public class Shoot extends Command {
+import edu.wpi.first.wpilibj.command.CommandGroup;
+import edu.wpi.first.wpilibj.command.WaitCommand;
 
-       public Shoot() {
-       }
+public class Shoot extends CommandGroup {
 
-       @Override
-       protected void initialize() {
-       }
-
-       @Override
-       protected void execute() {
-       }
-
-       @Override
-       protected boolean isFinished() {
-               return false;
-       }
-
-       @Override
-       protected void end() {
-       }
-
-       @Override
-       protected void interrupted() {
-       }
+  public Shoot() {
+    addSequential(new AimAndAlign());
+    addSequential(new WaitCommand(3.0));
+    addSequential(new runShooter());
+    addSequential(new WaitCommand(3.0));
+    addSequential(new Punch());
+  }
 }