From 817379d36ad2ca8d49cb09bfca33a79517a96aeb Mon Sep 17 00:00:00 2001 From: "Keenan D. Buckley" Date: Fri, 9 Mar 2018 18:15:50 -0700 Subject: [PATCH] auto changes --- .../usfirst/frc4388/robot/commands/auton/CenterLeft.java | 8 ++++---- .../usfirst/frc4388/robot/commands/auton/CenterRight.java | 8 ++++---- .../frc4388/robot/commands/auton/CrossTheBaseLine.java | 2 +- .../frc4388/robot/commands/auton/LeftStartRightScore.java | 2 +- .../frc4388/robot/commands/auton/LeftSwitchAuton.java | 8 ++++---- .../frc4388/robot/commands/auton/RightSwitchAuton.java | 8 ++++---- .../usfirst/frc4388/robot/commands/auton/ScaleFrom3.java | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/org/usfirst/frc4388/robot/commands/auton/CenterLeft.java b/src/org/usfirst/frc4388/robot/commands/auton/CenterLeft.java index ed95744..eba9486 100644 --- a/src/org/usfirst/frc4388/robot/commands/auton/CenterLeft.java +++ b/src/org/usfirst/frc4388/robot/commands/auton/CenterLeft.java @@ -28,18 +28,18 @@ public class CenterLeft extends CommandGroup { addSequential(new IntakePosition(true)); addSequential(new DriveSpeedShift(true)); - addSequential(new DriveStraightBasic(-15, 60, true, true, 0)); + addSequential(new DriveStraightBasic(-15, 50, true, true, 0)); addSequential(new DriveTurnBasic(true, 130, 300, MPSoftwareTurnType.TANK)); - addSequential(new DriveStraightBasic(53, 60, true, true, 0)); + addSequential(new DriveStraightBasic(53, 50, true, true, 0)); addSequential(new ElevatorBasic(20)); addSequential(new DriveTurnBasic(true, 34.5, 300, MPSoftwareTurnType.TANK)); - addSequential(new DriveStraightBasic(19, 60, true, true, 0)); + addSequential(new DriveStraightBasic(19, 50, true, true, 0)); 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, 60, true, true, 0)); + addSequential(new DriveStraightBasic(-20, 50, true, true, 0)); addSequential(new ElevatorBasic(10)); addSequential(new DriveSpeedShift(false)); } diff --git a/src/org/usfirst/frc4388/robot/commands/auton/CenterRight.java b/src/org/usfirst/frc4388/robot/commands/auton/CenterRight.java index 06a9a50..85b3476 100644 --- a/src/org/usfirst/frc4388/robot/commands/auton/CenterRight.java +++ b/src/org/usfirst/frc4388/robot/commands/auton/CenterRight.java @@ -29,18 +29,18 @@ public class CenterRight extends CommandGroup { addSequential(new DriveSpeedShift(true)); - addSequential(new DriveStraightBasic(-15, 60, true, true, 0)); + addSequential(new DriveStraightBasic(-15, 50, true, true, 0)); addSequential(new DriveTurnBasic(true, -130, 300, MPSoftwareTurnType.TANK)); - addSequential(new DriveStraightBasic(53, 60, true, true, 0)); + addSequential(new DriveStraightBasic(53, 50, true, true, 0)); addSequential(new ElevatorBasic(20)); addSequential(new DriveTurnBasic(true, -34.5, 300, MPSoftwareTurnType.TANK)); - addSequential(new DriveStraightBasic(19, 60, true, true, 0)); + addSequential(new DriveStraightBasic(19, 50, true, true, 0)); 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, 60, true, true, 0)); + addSequential(new DriveStraightBasic(-20, 50, true, true, 0)); addSequential(new DriveSpeedShift(false)); } } diff --git a/src/org/usfirst/frc4388/robot/commands/auton/CrossTheBaseLine.java b/src/org/usfirst/frc4388/robot/commands/auton/CrossTheBaseLine.java index 44919b5..abc83a1 100644 --- a/src/org/usfirst/frc4388/robot/commands/auton/CrossTheBaseLine.java +++ b/src/org/usfirst/frc4388/robot/commands/auton/CrossTheBaseLine.java @@ -19,7 +19,7 @@ public class CrossTheBaseLine extends CommandGroup { addSequential(new DriveGyroReset()); addSequential(new DriveSpeedShift(true)); addSequential(new IntakePosition(true)); - addSequential(new DriveStraightBasic(-90, 60, true, true, 0)); + addSequential(new DriveStraightBasic(-90, 50, true, true, 0)); addSequential(new DriveSpeedShift(false)); diff --git a/src/org/usfirst/frc4388/robot/commands/auton/LeftStartRightScore.java b/src/org/usfirst/frc4388/robot/commands/auton/LeftStartRightScore.java index f7d360e..b8352e4 100644 --- a/src/org/usfirst/frc4388/robot/commands/auton/LeftStartRightScore.java +++ b/src/org/usfirst/frc4388/robot/commands/auton/LeftStartRightScore.java @@ -43,6 +43,6 @@ public class LeftStartRightScore extends CommandGroup { addSequential(new IntakeSetSpeed(Carriage.CUBE_STOP_SPEED)); addSequential(new DriveStraightBasic(-10, 50, true, true, 0)); addSequential(new DriveSpeedShift(false)); - //addSequential(new DriveStraightMP(60, 10, true, true, 0)); // 95 for 112" greenville + //addSequential(new DriveStraightMP(50, 10, true, true, 0)); // 95 for 112" greenville } } diff --git a/src/org/usfirst/frc4388/robot/commands/auton/LeftSwitchAuton.java b/src/org/usfirst/frc4388/robot/commands/auton/LeftSwitchAuton.java index 1cbe289..551db80 100644 --- a/src/org/usfirst/frc4388/robot/commands/auton/LeftSwitchAuton.java +++ b/src/org/usfirst/frc4388/robot/commands/auton/LeftSwitchAuton.java @@ -28,20 +28,20 @@ public class LeftSwitchAuton extends CommandGroup { addSequential(new IntakePosition(true)); - addSequential(new DriveStraightBasic(-130, 60, true, true, 0)); + addSequential(new DriveStraightBasic(-130, 50, true, true, 0)); addSequential(new ElevatorBasic(30)); addSequential(new DriveTurnBasic(true, -87, 300, MPSoftwareTurnType.TANK)); addSequential(new ElevatorBasic(30)); - addSequential(new DriveStraightBasic(20, 60, true, true, 0)); + addSequential(new DriveStraightBasic(20, 50, true, true, 0)); addSequential(new IntakeSetSpeed(Carriage.CUBE_EJECT_SPEED)); //addSequential(new WaitCommand(.1)); addSequential(new IntakePosition(false)); addSequential(new WaitCommand(.5)); addSequential(new IntakeSetSpeed(Carriage.CUBE_STOP_SPEED)); - addSequential(new DriveStraightBasic(-20, 60, true, true, 0)); + addSequential(new DriveStraightBasic(-20, 50, true, true, 0)); addSequential(new DriveSpeedShift(false)); - //addSequential(new DriveStraightMP(60, 10, true, true, 0)); // 95 for 112" greenville + //addSequential(new DriveStraightMP(50, 10, true, true, 0)); // 95 for 112" greenville } } diff --git a/src/org/usfirst/frc4388/robot/commands/auton/RightSwitchAuton.java b/src/org/usfirst/frc4388/robot/commands/auton/RightSwitchAuton.java index b5b4a49..93e53b3 100644 --- a/src/org/usfirst/frc4388/robot/commands/auton/RightSwitchAuton.java +++ b/src/org/usfirst/frc4388/robot/commands/auton/RightSwitchAuton.java @@ -28,20 +28,20 @@ public class RightSwitchAuton extends CommandGroup { addSequential(new IntakePosition(true)); - addSequential(new DriveStraightBasic(-130, 60, true, true, 0)); + addSequential(new DriveStraightBasic(-130, 50, true, true, 0)); addSequential(new ElevatorBasic(30)); addSequential(new DriveTurnBasic(true, 87, 300, MPSoftwareTurnType.TANK)); addSequential(new ElevatorBasic(30)); - addSequential(new DriveStraightBasic(20, 60, true, true, 0)); + addSequential(new DriveStraightBasic(20, 50, true, true, 0)); addSequential(new IntakeSetSpeed(Carriage.CUBE_EJECT_SPEED)); //addSequential(new WaitCommand(.1)); addSequential(new IntakePosition(false)); addSequential(new WaitCommand(.5)); addSequential(new IntakeSetSpeed(Carriage.CUBE_STOP_SPEED)); - addSequential(new DriveStraightBasic(-20, 60, true, true, 0)); + addSequential(new DriveStraightBasic(-20, 50, true, true, 0)); addSequential(new DriveSpeedShift(false)); - //addSequential(new DriveStraightMP(60, 10, true, true, 0)); // 95 for 112" greenville + //addSequential(new DriveStraightMP(50, 10, true, true, 0)); // 95 for 112" greenville } } diff --git a/src/org/usfirst/frc4388/robot/commands/auton/ScaleFrom3.java b/src/org/usfirst/frc4388/robot/commands/auton/ScaleFrom3.java index 25dfd3e..60e05b0 100644 --- a/src/org/usfirst/frc4388/robot/commands/auton/ScaleFrom3.java +++ b/src/org/usfirst/frc4388/robot/commands/auton/ScaleFrom3.java @@ -28,7 +28,7 @@ public class ScaleFrom3 extends CommandGroup { addSequential(new IntakePosition(true)); - addSequential(new DriveStraightBasic(-290, 60, true, true, 0)); + addSequential(new DriveStraightBasic(-290, 50, true, true, 0)); addSequential(new ElevatorBasic(70)); addSequential(new DriveTurnBasic(true, 90, 100, MPSoftwareTurnType.TANK)); //addSequential(new DriveStraightBasic(5, 20, true, true, 0)); @@ -41,7 +41,7 @@ public class ScaleFrom3 extends CommandGroup { addSequential(new ElevatorBasic(10)); addSequential(new DriveSpeedShift(false)); - //addSequential(new DriveStraightMP(60, 10, true, true, 0)); // 95 for 112" greenville + //addSequential(new DriveStraightMP(50, 10, true, true, 0)); // 95 for 112" greenville } } \ No newline at end of file