This commit is contained in:
Luke Staudacher
2018-03-24 09:46:41 -06:00
parent f41b860e0e
commit 482698b216
4 changed files with 9 additions and 25 deletions
@@ -39,18 +39,6 @@ public class CenterLeft extends CommandGroup {
addSequential(new DriveStraightBasic(12, 45, true, true, 0)); addSequential(new DriveStraightBasic(12, 45, true, true, 0));
addSequential(new WaitCommand(3)); addSequential(new WaitCommand(3));
/*
addSequential(new IntakeSetSpeed(Carriage.CUBE_EJECT_SPEED));
//addSequential(new WaitCommand(.1));
addSequential(new IntakePosition(false));
addSequential(new WaitCommand(.2));
addSequential(new IntakeSetSpeed(Carriage.CUBE_STOP_SPEED));
*/
addSequential(new DriveStraightBasic(-20, 45, true, true, 0)); addSequential(new DriveStraightBasic(-20, 45, true, true, 0));
addSequential(new ElevatorBasic(10)); addSequential(new ElevatorBasic(10));
addSequential(new DriveSpeedShift(false)); addSequential(new DriveSpeedShift(false));
@@ -31,11 +31,11 @@ public class CenterLeft2Cube extends CommandGroup {
addSequential(new DriveStraightBasic(-15, 30, true, true, 0)); addSequential(new DriveStraightBasic(-15, 30, true, true, 0));
addSequential(new DriveTurnBasic(true, 115, 150, MPSoftwareTurnType.TANK)); addSequential(new DriveTurnBasic(true, 115, 150, MPSoftwareTurnType.TANK));
addSequential(new WaitCommand(.2)); addSequential(new WaitCommand(.2));
addSequential(new DriveStraightBasic(80, 45, true, true, 0)); addSequential(new DriveStraightBasic(70, 45, true, true, 0));
addSequential(new ElevatorBasic(30)); addSequential(new ElevatorBasic(30));
addSequential(new DriveTurnBasic(true, 28, 150, MPSoftwareTurnType.TANK)); addSequential(new DriveTurnBasic(true, 30, 150, MPSoftwareTurnType.TANK));
addParallel(new TimeoutBecaseYea()); addParallel(new TimeoutBecaseYea());
addSequential(new DriveStraightBasic(12, 45, true, true, 0)); addSequential(new DriveStraightBasic(18, 45, true, true, 0));
addSequential(new WaitCommand(1)); addSequential(new WaitCommand(1));
addSequential(new DriveStraightBasic(-20, 45, true, true, 0)); addSequential(new DriveStraightBasic(-20, 45, true, true, 0));
addSequential(new ElevatorBasic(3)); addSequential(new ElevatorBasic(3));
@@ -23,22 +23,22 @@ public class CenterRight2Cube extends CommandGroup {
addSequential(new DriveSpeedShift(true)); addSequential(new DriveSpeedShift(true));
addSequential(new DriveStraightBasic(-15, 60, true, true, 0)); addSequential(new DriveStraightBasic(-15, 60, true, true, 0));
addSequential(new DriveTurnBasic(true, -115, 150, MPSoftwareTurnType.TANK)); addSequential(new DriveTurnBasic(true, -122, 150, MPSoftwareTurnType.TANK));
addSequential(new WaitCommand(.2)); addSequential(new WaitCommand(.2));
addSequential(new DriveStraightBasic(65, 60, true, true, 0)); addSequential(new DriveStraightBasic(55, 60, true, true, 0));
addSequential(new ElevatorBasic(25)); addSequential(new ElevatorBasic(25));
addSequential(new DriveTurnBasic(true, -38, 150, MPSoftwareTurnType.TANK)); addSequential(new DriveTurnBasic(true, -39, 150, MPSoftwareTurnType.TANK));
addParallel(new TimeoutBecaseYea()); addParallel(new TimeoutBecaseYea());
addSequential(new DriveStraightBasic(25, 45, true, true, 0)); addSequential(new DriveStraightBasic(30, 40, true, true, 0));
addSequential(new WaitCommand(1)); addSequential(new WaitCommand(1));
addSequential(new DriveStraightBasic(-20, 45, true, true, 0)); addSequential(new DriveStraightBasic(-20, 45, true, true, 0));
addSequential(new ElevatorBasic(3)); addSequential(new ElevatorBasic(3));
addSequential(new DriveTurnBasic(true, -75, 150, MPSoftwareTurnType.TANK)); addSequential(new DriveTurnBasic(true, -75, 150, MPSoftwareTurnType.TANK));
addSequential(new IntakeSetSpeed(Carriage.CUBE_INTAKE_SPEED)); addSequential(new IntakeSetSpeed(Carriage.CUBE_INTAKE_SPEED));
addSequential(new DriveStraightBasic(45, 45, true, true, 0)); addSequential(new DriveStraightBasic(43, 45, true, true, 0));
addSequential(new WaitCommand(2)); addSequential(new WaitCommand(2));
addSequential(new IntakePosition(true)); addSequential(new IntakePosition(true));
addSequential(new DriveStraightBasic(-40, 60, true, true, 0)); addSequential(new DriveStraightBasic(-30, 45, true, true, 0));
addSequential(new IntakeSetSpeed(Carriage.CUBE_STOP_SPEED)); addSequential(new IntakeSetSpeed(Carriage.CUBE_STOP_SPEED));
addSequential(new ElevatorBasic(25)); addSequential(new ElevatorBasic(25));
addSequential(new DriveTurnBasic(true, 75, 150, MPSoftwareTurnType.TANK)); addSequential(new DriveTurnBasic(true, 75, 150, MPSoftwareTurnType.TANK));
@@ -28,9 +28,6 @@ public class Cube2Right extends CommandGroup {
addSequential(new DriveSpeedShift(true)); addSequential(new DriveSpeedShift(true));
addSequential(new IntakePosition(true)); addSequential(new IntakePosition(true));
//addSequential(new DriveStraightBasic(-10, 35, true, true, 0));
addSequential(new DriveStraightBasic(-300, 70, true, true, 0)); addSequential(new DriveStraightBasic(-300, 70, true, true, 0));
addSequential(new DriveStraightBasic(1, 30, true, true, 0)); addSequential(new DriveStraightBasic(1, 30, true, true, 0));
addSequential(new ElevatorBasic(70)); addSequential(new ElevatorBasic(70));
@@ -71,7 +68,6 @@ public class Cube2Right extends CommandGroup {
addSequential(new ElevatorBasic(5)); addSequential(new ElevatorBasic(5));
addSequential(new DriveSpeedShift(false)); addSequential(new DriveSpeedShift(false));