Fix merge conflicts

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

diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/ExtendPunch.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/ExtendPunch.java
new file mode 100644 (file)
index 0000000..a3cb813
--- /dev/null
+++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/ExtendPunch.java
@@ -0,0 +1,34 @@
+package org.usfirst.frc.team3501.robot.commands.shooter;
+
+import org.usfirst.frc.team3501.robot.Robot;
+
+import edu.wpi.first.wpilibj.command.Command;
+
+public class ExtendPunch extends Command {
+
+  @Override
+  protected void initialize() {
+    Robot.shooter.extendPunch();
+  }
+
+  @Override
+  protected void execute() {
+
+  }
+
+  @Override
+  protected boolean isFinished() {
+    return true;
+  }
+
+  @Override
+  protected void end() {
+
+  }
+
+  @Override
+  protected void interrupted() {
+
+  }
+
+}