Fix syntax errors in master got in the last merge

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / commands / auton / PassRockWall.java

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 7498138e26a60b1bc04d2dfcb45adb58682dd8dd..1b74da6c593955bc09a7bb1fec94542a417355e8 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java
@@ -1,10 +1,18 @@
 package org.usfirst.frc.team3501.robot.commands.auton;
 
-import edu.wpi.first.wpilibj.command.Command;
+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;
 
 /***
  * This command will drive the robot through the rock wall.
  *
+ * dependency on subsystems: drivetrain
+ *
+ * dependency on other commands: DriveForTime
+ *
  * pre-condition: robot is flush against the ramp of the outerworks in front of
  * the rock wall
  *
@@ -13,29 +21,19 @@ import edu.wpi.first.wpilibj.command.Command;
  * @author Meryem and Avi
  *
  */
-public class PassRockWall extends Command {
 
-  public PassRockWall() {
-  }
-
-  @Override
-  protected void initialize() {
-  }
+public class PassRockWall extends CommandGroup {
 
-  @Override
-  protected void execute() {
-  }
-
-  @Override
-  protected boolean isFinished() {
-    return false;
-  }
-
-  @Override
-  protected void end() {
-  }
+  public PassRockWall() {
+    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));
+    }
 
-  @Override
-  protected void interrupted() {
   }
 }