Fix syntax errors in master got in the last merge

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 3f43356e72ef349d26ff0e73bce71ceff2950a44..be002264643edb554842d88bba54b94137f24b3b 100644 (file)
--- 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 780589171246a4c9b556ee3887349adc7022cb4d..ec467836653fa8977f97c9cc953e1bce7079fdef 100755 (executable)
--- 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 55646b5a94254c695f5a0ebd97ad48886ba275aa..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
@@ -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 8e3ccba55d206bf2114122aaca380e3e96764374..632974a16be16d282caf00521491eb11cf7923c8 100644 (file)
--- 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(