just moving some commands/button around to try and make room on the

manipulator

Author: DriverStationComputer

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

@@ -23,8 +23,6 @@
 import org.usfirst.frc.team199.Robot2018.commands.ShiftHighGear;
 import org.usfirst.frc.team199.Robot2018.commands.ShiftLowGear;
 import org.usfirst.frc.team199.Robot2018.commands.StopIntake;
-import org.usfirst.frc.team199.Robot2018.commands.ToggleLeftIntake;
-import org.usfirst.frc.team199.Robot2018.commands.ToggleRightIntake;
 import org.usfirst.frc.team199.Robot2018.commands.UpdatePIDConstants;
 import org.usfirst.frc.team199.Robot2018.subsystems.LiftInterface.LiftHeight;
 
@@ -125,9 +123,6 @@ public OI(Robot robot) {
 		moveLiftDownButton = new JoystickButton(rightJoy, getButton("Run Lift Motor Down", 11));
 		moveLiftDownButton.whileHeld(new MoveLift(Robot.lift, false));
 
-		stopIntakeButton = new JoystickButton(rightJoy, getButton("Stop Intake Button", 6));
-		stopIntakeButton.whenPressed(new StopIntake());
-
 		manipulator = new Joystick(2);
 		if (manipulator.getButtonCount() == 0) {
 			System.err.println(
@@ -137,20 +132,21 @@ public OI(Robot robot) {
 			closeIntakeButton.whenPressed(new CloseIntake());
 			openIntakeButton = new JoystickButton(manipulator, getButton("Open Intake Button", 2));
 			openIntakeButton.whenPressed(new OpenIntake());
-			// raiseIntake = new JoystickButton(manipulator, getButton("Raise Intake
-			// Button", 3));
-			// raiseIntake.whenPressed(new RaiseIntake());
-			// lowerIntake = new JoystickButton(manipulator, getButton("Lower Intake
-			// Button", 4));
-			// lowerIntake.whenPressed(new LowerIntake());
+
 			intakeCubeButton = new JoystickButton(manipulator, getButton("Intake Button", 5));
 			intakeCubeButton.whenPressed(new IntakeCube());
 			outakeCubeButton = new JoystickButton(manipulator, getButton("Outake Button", 6));
 			outakeCubeButton.whenPressed(new OuttakeCube());
-			toggleLeftIntakeButton = new JoystickButton(manipulator, getButton("Toggle Left Intake Button", 3));
-			toggleLeftIntakeButton.whenPressed(new ToggleLeftIntake());
-			toggleRightIntakeButton = new JoystickButton(manipulator, getButton("Toggle Right Intake Button", 4));
-			toggleRightIntakeButton.whenPressed(new ToggleRightIntake());
+
+			stopIntakeButton = new JoystickButton(manipulator, getButton("Stop Intake Button", 3));
+			stopIntakeButton.whenPressed(new StopIntake());
+
+			// toggleLeftIntakeButton = new JoystickButton(manipulator, getButton("Toggle
+			// Left Intake Button", 3));
+			// toggleLeftIntakeButton.whenPressed(new ToggleLeftIntake());
+			// toggleRightIntakeButton = new JoystickButton(manipulator, getButton("Toggle
+			// Right Intake Button", 4));
+			// toggleRightIntakeButton.whenPressed(new ToggleRightIntake());
 		}
 
 	}

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

@@ -18,6 +18,7 @@ public DefaultIntake() {
 	}
 
 	// Called just before this Command runs the first time
+	@Override
 	protected void initialize() {
 		try {
 			Robot.oi.manipulator.getRawAxis(1);
@@ -28,6 +29,7 @@ protected void initialize() {
 	}
 
 	// Called repeatedly when this Command is scheduled to run
+	@Override
 	protected void execute() {
 		// 1 and 5 represent the axes' index in driver station
 		if (manipulatorPluggedIn) {
@@ -37,17 +39,20 @@ protected void execute() {
 	}
 
 	// Make this return true when this Command no longer needs to run execute()
+	@Override
 	protected boolean isFinished() {
 		return false;
 	}
 
 	// Called once after isFinished returns true
+	@Override
 	protected void end() {
 		Robot.intakeEject.runIntake(0);
 	}
 
 	// Called when another command which requires one or more of the same
 	// subsystems is scheduled to run
+	@Override
 	protected void interrupted() {
 		end();
 	}

Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEject.java

@@ -2,7 +2,6 @@
 
 import org.usfirst.frc.team199.Robot2018.Robot;
 import org.usfirst.frc.team199.Robot2018.RobotMap;
-import org.usfirst.frc.team199.Robot2018.commands.DefaultIntake;
 
 import edu.wpi.first.wpilibj.DoubleSolenoid;
 import edu.wpi.first.wpilibj.PowerDistributionPanel;
@@ -39,7 +38,8 @@ public boolean isOpen(DoubleSolenoid.Value val) {
 	 */
 	@Override
 	public void initDefaultCommand() {
-		setDefaultCommand(new DefaultIntake());
+		// I don't want this on the manipulator joysticks during a match
+		// setDefaultCommand(new DefaultIntake());
 	}
 
 	/**