Fix ports and unusuable code to make shooter test work

[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 e136c739ae78e74b1da7503258ffa29828fae850..df25ac13dcdcd96a145c19ae3924d7d15de86547 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,17 +1,28 @@
 package org.usfirst.frc.team3501.robot.commands.shooter;
 
-import org.usfirst.frc.team3501.robot.commands.auton.AimAndAlign;
-
 import edu.wpi.first.wpilibj.command.CommandGroup;
 import edu.wpi.first.wpilibj.command.WaitCommand;
 
 public class Shoot extends CommandGroup {
 
+  public boolean usePhotogate;
+
   public Shoot() {
-    addSequential(new AimAndAlign());
+    addSequential(new StartShooter());
     addSequential(new WaitCommand(3.0));
-    addSequential(new runShooter());
-    addSequential(new WaitCommand(3.0));
-    addSequential(new Punch());
+    // if (Robot.shooter.usePhotogate()) {
+    // if (Robot.shooter.isBallInside()) {
+    // addSequential(new ExtendPunch());
+    // addSequential(new WaitCommand(5.0));
+    // addSequential(new RetractPunch());
+    // addSequential(new StopShooter());
+    // }
+    // } else {
+    addSequential(new ExtendPunch());
+    addSequential(new WaitCommand(5.0));
+    addSequential(new RetractPunch());
+    addSequential(new StopShooter());
+    // }
+
   }
 }