From 0f3df681ca44dc9f5c77f61326e1d7b0143ca2b9 Mon Sep 17 00:00:00 2001
From: Kevin Zhang <icestormf1@gmail.com>
Date: Thu, 18 Feb 2016 14:55:41 -0800
Subject: [PATCH] Fix syntax errors in master got in the last merge

---
 .../usfirst/frc/team3501/robot/commands/auton/PassLowBar.java | 2 +-
 .../frc/team3501/robot/commands/auton/PassRampart.java        | 4 ++--
 .../frc/team3501/robot/commands/auton/PassRockWall.java       | 2 +-
 .../frc/team3501/robot/commands/auton/PassRoughTerrain.java   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java
index 3f43356e..be002264 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java
@@ -26,7 +26,7 @@ public class PassLowBar extends CommandGroup {
 
   public PassLowBar() {
     if (Constants.Auton.IS_USING_TIME) {
-      addSequential(new DriveForTime(Constants.Auton.PASS_LOW_BAR_TIMEpassLowBarTime,
+      addSequential(new DriveForTime(Constants.Auton.PASS_LOW_BAR_TIME,
           Constants.Auton.PASS_LOW_BAR_SPEED));
     }
     else {
diff --git a/src/org/usfirst/frc/team3501/robot/commands/auton/PassRampart.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRampart.java
index 78058917..ec467836 100755
--- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassRampart.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRampart.java
@@ -27,8 +27,8 @@ public class PassRampart extends CommandGroup {
   public PassRampart() {
 
     if (Constants.Auton.IS_USING_TIME) {
-      addSequential(new DriveForTime(Constants.Auton.PASS_ROCK_WALL_TIME,
-          Constants.Auton.passRockWallSpeed));
+      addSequential(new DriveForTime(Constants.Auton.PASS_RAMPART_TIME,
+          Constants.Auton.PASS_RAMPART_SPEED));
     }
     else {
       addSequential(new DriveDistance(
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 55646b5a..1b74da6c 100755
--- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java
@@ -27,7 +27,7 @@ public class PassRockWall extends CommandGroup {
   public PassRockWall() {
     if (Constants.Auton.IS_USING_TIME) {
       addSequential(new DriveForTime(Constants.Auton.PASS_ROCK_WALL_TIME,
-          Constants.Auton.passRockWallSpeed));
+          Constants.Auton.PASS_ROCK_WALL_SPEED));
     }
     else {
       addSequential(new DriveDistance(
diff --git a/src/org/usfirst/frc/team3501/robot/commands/auton/PassRoughTerrain.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRoughTerrain.java
index 8e3ccba5..632974a1 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassRoughTerrain.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRoughTerrain.java
@@ -27,8 +27,8 @@ public class PassRoughTerrain extends CommandGroup {
   public PassRoughTerrain() {
 
     if (Constants.Auton.IS_USING_TIME) {
-      addSequential(new DriveForTime(Constants.Auton.PASS_ROCK_WALL_TIME,
-          Constants.Auton.passRockWallSpeed));
+      addSequential(new DriveForTime(Constants.Auton.PASS_ROUGH_TERRAIN_TIME,
+          Constants.Auton.PASS_ROUGH_TERRAIN_SPEED));
     }
     else {
       addSequential(new DriveDistance(
-- 
2.30.2