From ca325a5866b4f601b171b02ac767393bd996d44a Mon Sep 17 00:00:00 2001 From: Meryem Esa Date: Wed, 17 Feb 2016 16:53:57 -0800 Subject: [PATCH] refactor isUsingTimeToPassDefense to isUsingTime --- src/org/usfirst/frc/team3501/robot/Constants.java | 2 +- .../usfirst/frc/team3501/robot/commands/auton/AlignToScore.java | 2 +- .../usfirst/frc/team3501/robot/commands/auton/PassLowBar.java | 2 +- src/org/usfirst/frc/team3501/robot/commands/auton/PassMoat.java | 2 +- .../usfirst/frc/team3501/robot/commands/auton/PassRampart.java | 2 +- .../usfirst/frc/team3501/robot/commands/auton/PassRockWall.java | 2 +- .../frc/team3501/robot/commands/auton/PassRoughTerrain.java | 2 +- src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index 7245d5fe..374c6bad 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -230,7 +230,7 @@ public class Constants { // Passing Defenses Constants public static final double DEFAULT_SPEED = 0.5; - public static boolean isUsingTimeToPassDefense = true; + public static boolean isUsingTime = true; // 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/AlignToScore.java b/src/org/usfirst/frc/team3501/robot/commands/auton/AlignToScore.java index 6d0b9ede..6450fa03 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/auton/AlignToScore.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/AlignToScore.java @@ -39,7 +39,7 @@ public class AlignToScore extends CommandGroup { public double horizontalDistToGoal; public AlignToScore(int position) { - if (Constants.Auton.isUsingTimeToPassDefense) { + if (Constants.Auton.isUsingTime) { if (position == 1) { addSequential(new DriveForTime(Constants.Auton.POS1_DIST1_TIME, Constants.Auton.POS1_DRIVE_MAXSPEED)); 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 8f35a25c..9ee3e6ee 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.Auton.isUsingTimeToPassDefense) { + if (Constants.Auton.isUsingTime) { addSequential(new DriveForTime(Constants.Auton.passLowBarTime, Constants.Auton.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 3539d970..b0f2b842 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.Auton.isUsingTimeToPassDefense) { + if (Constants.Auton.isUsingTime) { addSequential(new DriveForTime(Constants.Auton.passMoatTime, Constants.Auton.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 30051460..e5af033e 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.Auton.isUsingTimeToPassDefense) { + if (Constants.Auton.isUsingTime) { addSequential(new DriveForTime(Constants.Auton.passRockWallTime, Constants.Auton.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 a0b6690c..dae5e038 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.Auton.isUsingTimeToPassDefense) { + if (Constants.Auton.isUsingTime) { addSequential(new DriveForTime(Constants.Auton.passRockWallTime, Constants.Auton.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 e3d64dde..f1b03726 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.Auton.isUsingTimeToPassDefense) { + if (Constants.Auton.isUsingTime) { addSequential(new DriveForTime(Constants.Auton.passRockWallTime, Constants.Auton.passRockWallSpeed)); } diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java index 9852848e..e19b46f0 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java @@ -368,6 +368,6 @@ public class DriveTrain extends PIDSubsystem { } public void toggleTimeDeadReckoning() { - Constants.Auton.isUsingTimeToPassDefense = !Constants.Auton.isUsingTimeToPassDefense; + Constants.Auton.isUsingTime = !Constants.Auton.isUsingTime; } } -- 2.30.2