fix StopIntake

The problem was that StopIntake was called and the intake was stopped,
but the IntakeCube command was still running so StopIntake only jerked
it to a stop and then restarted.

Author: DriverStationComputer

Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java

@@ -54,6 +54,8 @@ public class Robot extends IterativeRobot {
 
 	public static Map<String, ArrayList<String[]>> autoScripts;
 
+	public static boolean stopIntake = false;
+
 	Command autonomousCommand;
 	SendableChooser<Autonomous.Position> posChooser = new SendableChooser<Autonomous.Position>();
 	Map<String, SendableChooser<Strategy>> stratChoosers = new HashMap<String, SendableChooser<Strategy>>();

Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/IntakeCube.java

@@ -48,13 +48,14 @@ protected void execute() {
 	// Make this return true when this Command no longer needs to run execute()
 	@Override
 	protected boolean isFinished() {
-		return tim.get() > Robot.getConst("Has Cube Timeout", 0.5);
+		return tim.get() > Robot.getConst("Has Cube Timeout", 0.5) || Robot.stopIntake;
 	}
 
 	// Called once after isFinished returns true
 	@Override
 	protected void end() {
 		Robot.intakeEject.stopIntake();
+		Robot.stopIntake = false;
 	}
 
 	// Called when another command which requires one or more of the same

Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/StopIntake.java

@@ -22,14 +22,15 @@ public StopIntake() {
 	// Called just before this Command runs the first time
 	@Override
 	protected void initialize() {
+		Robot.stopIntake = true;
 		tim = new Timer();
 		tim.reset();
 		tim.start();
 	}
 
 	@Override
 	protected void execute() {
-		Robot.intakeEject.stopIntake();
+		// Robot.intakeEject.stopIntake();
 	}
 
 	@Override