From a2b9c4a91d47d4eb29c8ff8c2ef7899c158b8dcb Mon Sep 17 00:00:00 2001 From: Meryem Esa Date: Wed, 10 Feb 2016 19:04:52 -0800 Subject: [PATCH] add constants and sequentials for position 3 --- .../team3501/robot/commands/AlignToScore.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/commands/AlignToScore.java b/src/org/usfirst/frc/team3501/robot/commands/AlignToScore.java index 8285a95c..012ffad6 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/AlignToScore.java +++ b/src/org/usfirst/frc/team3501/robot/commands/AlignToScore.java @@ -28,6 +28,11 @@ public class AlignToScore extends CommandGroup { private final double POS2_DIST2 = 0; // constants for position 3 + private final double POS3_DIST1 = 0; + private final double POS3_TURN1 = 0; + private final double POS3_DIST2 = 0; + private final double POS3_TURN2 = 0; + private final double POS3_DIST3 = 0; // constants for position 4 @@ -40,19 +45,24 @@ public class AlignToScore extends CommandGroup { // position 1 is always the low bar case 1: - addSequential(new DriveForDistance(POS2_DIST1, DEFAULT_SPEED)); - addSequential(new TurnForAngle(POS2_TURN1)); - addSequential(new DriveForDistance(POS2_DIST2, DEFAULT_SPEED)); - - case 2: - addSequential(new DriveForDistance(POS1_DIST1, DEFAULT_SPEED)); addSequential(new TurnForAngle(POS1_TURN1)); addSequential(new DriveForDistance(POS1_DIST2, DEFAULT_SPEED)); + case 2: + + addSequential(new DriveForDistance(POS2_DIST1, DEFAULT_SPEED)); + addSequential(new TurnForAngle(POS2_TURN1)); + addSequential(new DriveForDistance(POS2_DIST2, DEFAULT_SPEED)); + case 3: - addSequential(); + addSequential(new DriveForDistance(POS3_DIST1, DEFAULT_SPEED)); + addSequential(new TurnForAngle(POS3_TURN1)); + addSequential(new DriveForDistance(POS3_DIST2, DEFAULT_SPEED)); + addSequential(new TurnForAngle(POS3_TURN2)); + addSequential(new DriveForDistance(POS3_DIST3, DEFAULT_SPEED)); + ; case 4: -- 2.30.2