X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fcommands%2Fauton%2FPassRockWall.java;h=1b74da6c593955bc09a7bb1fec94542a417355e8;hb=0f3df681ca44dc9f5c77f61326e1d7b0143ca2b9;hp=b27c6de12428917260cb4dcddf32ceb8111125f0;hpb=1fb6ed96403e3cd89640a375a690d34ea331d6c2;p=3501%2Fstronghold-2016

diff --git a/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java
index b27c6de1..1b74da6c 100755
--- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands.auton;
 
+import org.usfirst.frc.team3501.robot.Constants;
+import org.usfirst.frc.team3501.robot.commands.driving.DriveDistance;
 import org.usfirst.frc.team3501.robot.commands.driving.DriveForTime;
 
 import edu.wpi.first.wpilibj.command.CommandGroup;
@@ -22,18 +24,16 @@ import edu.wpi.first.wpilibj.command.CommandGroup;
 
 public class PassRockWall extends CommandGroup {
 
-  private final double BEG_TIME = 0;
-  private final double MID_TIME = 0;
-  private final double END_TIME = 0;
-  private final double BEG_SPEED = 0;
-  private final double MID_SPEED = 0;
-  private final double END_SPEED = 0;
-
   public PassRockWall() {
-
-    addSequential(new DriveForTime(BEG_TIME, BEG_SPEED));
-    addSequential(new DriveForTime(MID_TIME, MID_SPEED));
-    addSequential(new DriveForTime(END_TIME, END_SPEED));
+    if (Constants.Auton.IS_USING_TIME) {
+      addSequential(new DriveForTime(Constants.Auton.PASS_ROCK_WALL_TIME,
+          Constants.Auton.PASS_ROCK_WALL_SPEED));
+    }
+    else {
+      addSequential(new DriveDistance(
+          Constants.Auton.PASS_ROCK_WALL_DIST,
+          Constants.DriveTrain.PASS_DEFENSE_TIMEOUT));
+    }
 
   }
 }