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 31fb261e576f0a9748769a1bfa7dd3d5f94b1aee..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,7 +1,5 @@
 package org.usfirst.frc.team3501.robot.commands.shooter;
 
-import org.usfirst.frc.team3501.robot.Robot;
-
 import edu.wpi.first.wpilibj.command.CommandGroup;
 import edu.wpi.first.wpilibj.command.WaitCommand;
 
@@ -10,20 +8,21 @@ public class Shoot extends CommandGroup {
   public boolean usePhotogate;
 
   public Shoot() {
+    addSequential(new StartShooter());
     addSequential(new WaitCommand(3.0));
-    addSequential(new runShooter());
-    addSequential(new WaitCommand(3.0));
-    if (Robot.shooter.usePhotogate()) {
-      if (Robot.shooter.isBallInside()) {
-        addSequential(new ExtendPunch());
-        addSequential(new WaitCommand(5.0));
-        addSequential(new RetractPunch());
-      }
-    } else {
-      addSequential(new ExtendPunch());
-      addSequential(new WaitCommand(5.0));
-      addSequential(new RetractPunch());
-    }
+    // 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());
+    // }
 
   }
 }