From: Cindy Zhang Date: Tue, 16 Feb 2016 19:32:59 +0000 (-0800) Subject: change isDeadReckonging, which is misleading, to isUsingTimeToPassDefense X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=f11e620060e9ff7062b4409bbc4f14bb5bcf2e9d change isDeadReckonging, which is misleading, to isUsingTimeToPassDefense --- diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index 287344af..f5241d80 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -124,7 +124,7 @@ public class Constants { public static class DeadReckoning { public static final double DEFAULT_SPEED = 0.5; - public static boolean isDeadReckoning; + public static boolean isUsingTimeToPassDefense; // dead reckoning time and speed constants for driving through defenses public static double passRockWallTime = 0; 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 57259bba..49b085d0 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java @@ -25,7 +25,7 @@ import edu.wpi.first.wpilibj.command.CommandGroup; public class PassLowBar extends CommandGroup { public PassLowBar() { - if (Constants.DeadReckoning.isDeadReckoning) { + if (Constants.DeadReckoning.isUsingTimeToPassDefense) { addSequential(new DriveForTime(Constants.DeadReckoning.passLowBarTime, Constants.DeadReckoning.passLowBarSpeed)); } diff --git a/src/org/usfirst/frc/team3501/robot/commands/auton/PassMoat.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassMoat.java index f5b01c46..f9331077 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassMoat.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassMoat.java @@ -28,7 +28,7 @@ import edu.wpi.first.wpilibj.command.CommandGroup; public class PassMoat extends CommandGroup { public PassMoat() { - if (Constants.DeadReckoning.isDeadReckoning) { + if (Constants.DeadReckoning.isUsingTimeToPassDefense) { addSequential(new DriveForTime(Constants.DeadReckoning.passMoatTime, Constants.DeadReckoning.passMoatSpeed)); } 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 95bc2a23..21c12895 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassRampart.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRampart.java @@ -26,7 +26,7 @@ public class PassRampart extends CommandGroup { public PassRampart() { - if (Constants.DeadReckoning.isDeadReckoning) { + if (Constants.DeadReckoning.isUsingTimeToPassDefense) { addSequential(new DriveForTime(Constants.DeadReckoning.passRockWallTime, Constants.DeadReckoning.passRockWallSpeed)); } 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 4b4a088a..ea87ca29 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java @@ -25,7 +25,7 @@ import edu.wpi.first.wpilibj.command.CommandGroup; public class PassRockWall extends CommandGroup { public PassRockWall() { - if (Constants.DeadReckoning.isDeadReckoning) { + if (Constants.DeadReckoning.isUsingTimeToPassDefense) { addSequential(new DriveForTime(Constants.DeadReckoning.passRockWallTime, Constants.DeadReckoning.passRockWallSpeed)); } 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 ad5054dc..2ddddf43 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassRoughTerrain.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRoughTerrain.java @@ -26,7 +26,7 @@ public class PassRoughTerrain extends CommandGroup { public PassRoughTerrain() { - if (Constants.DeadReckoning.isDeadReckoning) { + if (Constants.DeadReckoning.isUsingTimeToPassDefense) { addSequential(new DriveForTime(Constants.DeadReckoning.passRockWallTime, Constants.DeadReckoning.passRockWallSpeed)); }