Drivebase to Master

src/org/usfirst/frc/team5401/robot/OI.java

@@ -92,6 +92,8 @@ public OI(){
 //		operatorY.whenPressed(new Climb(1));
 //		operatorY.whenReleased(new Climb(0));
 
+		//Xbox Move Override
+		driverX.whenPressed(new xboxMove());
 
 	}
 

src/org/usfirst/frc/team5401/robot/Robot.java

@@ -8,6 +8,7 @@
 import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 
+import org.usfirst.frc.team5401.robot.commands.xboxMove;
 import org.usfirst.frc.team5401.robot.subsystems.*;
 
 /**
@@ -47,7 +48,7 @@ public void robotInit() {
 		oi = new OI();
 
 		// chooser.addObject("My Auto", new MyAutoCommand());
-		SmartDashboard.putData("Auto mode", chooser);
+		chooser = new SendableChooser();
 	}
 
 	/**
@@ -108,6 +109,7 @@ public void teleopInit() {
 		// this line or comment it out.
 		if (autonomousCommand != null)
 			autonomousCommand.cancel();
+		Scheduler.getInstance().add(new xboxMove());
 	}
 
 	/**

src/org/usfirst/frc/team5401/robot/RobotMap.java

@@ -35,8 +35,8 @@ public class RobotMap {
     //PWM Motors
 	public static final int LEFT_DRIVE_MOTOR_1    = 0;
 	public static final int RIGHT_DRIVE_MOTOR_1   = 1;
-	public static final int LEFT_DRIVE_MOTOR_2    = 3;
-	public static final int RIGHT_DRIVE_MOTOR_2   = 4;
+	public static final int LEFT_DRIVE_MOTOR_2    = 7;
+	public static final int RIGHT_DRIVE_MOTOR_2   = 8;
 	public static final int INFEEDER_BAR          = 5;
 	public static final int CLIMBER_MOTOR         = 6;