projects
/
3501
/
stronghold-2016
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9d518a5
)
change isDeadReckonging, which is misleading, to isUsingTimeToPassDefense
author
Cindy Zhang
<cindyzyx9@gmail.com>
Tue, 16 Feb 2016 19:32:59 +0000
(11:32 -0800)
committer
Kevin Zhang
<icestormf1@gmail.com>
Tue, 16 Feb 2016 19:37:03 +0000
(11:37 -0800)
src/org/usfirst/frc/team3501/robot/Constants.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/auton/PassMoat.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/auton/PassRampart.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/auton/PassRoughTerrain.java
patch
|
blob
|
blame
|
history
diff --git
a/src/org/usfirst/frc/team3501/robot/Constants.java
b/src/org/usfirst/frc/team3501/robot/Constants.java
index 287344aff27229a8d681838fb4e5e77dbcb59e42..f5241d805d609dc306402aa3141affb0d323a415 100644
(file)
--- 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 class DeadReckoning {
public static final double DEFAULT_SPEED = 0.5;
- public static boolean is
DeadReckoning
;
+ public static boolean is
UsingTimeToPassDefense
;
// dead reckoning time and speed constants for driving through defenses
public static double passRockWallTime = 0;
// 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 57259bbaf78b4fd06007fe0b79c1602f9a941a7c..49b085d09e6a8ecf11ecd47cd325da75dd5267b3 100644
(file)
--- 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() {
public class PassLowBar extends CommandGroup {
public PassLowBar() {
- if (Constants.DeadReckoning.is
DeadReckoning
) {
+ if (Constants.DeadReckoning.is
UsingTimeToPassDefense
) {
addSequential(new DriveForTime(Constants.DeadReckoning.passLowBarTime,
Constants.DeadReckoning.passLowBarSpeed));
}
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 f5b01c468bb774533752c57afa1c19852bc78a2e..f9331077a8a0b9da6c2f0162374d75d63f237d1f 100755
(executable)
--- 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() {
public class PassMoat extends CommandGroup {
public PassMoat() {
- if (Constants.DeadReckoning.is
DeadReckoning
) {
+ if (Constants.DeadReckoning.is
UsingTimeToPassDefense
) {
addSequential(new DriveForTime(Constants.DeadReckoning.passMoatTime,
Constants.DeadReckoning.passMoatSpeed));
}
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 95bc2a233332c036472c66540558d9c70d9fb37f..21c128958e51b2ac09da94b5b3f21c98d4268378 100755
(executable)
--- 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() {
public PassRampart() {
- if (Constants.DeadReckoning.is
DeadReckoning
) {
+ if (Constants.DeadReckoning.is
UsingTimeToPassDefense
) {
addSequential(new DriveForTime(Constants.DeadReckoning.passRockWallTime,
Constants.DeadReckoning.passRockWallSpeed));
}
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 4b4a088a04b4e9b2f0c788208928fcc8355f07e2..ea87ca29ba5aa6e23a3cc22e9f2e92c752b72853 100755
(executable)
--- 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() {
public class PassRockWall extends CommandGroup {
public PassRockWall() {
- if (Constants.DeadReckoning.is
DeadReckoning
) {
+ if (Constants.DeadReckoning.is
UsingTimeToPassDefense
) {
addSequential(new DriveForTime(Constants.DeadReckoning.passRockWallTime,
Constants.DeadReckoning.passRockWallSpeed));
}
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 ad5054dc02f912bae607774dd84e77e2708a5595..2ddddf4389b5c469bc84bfbc67f77db7a54b8ea4 100644
(file)
--- 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() {
public PassRoughTerrain() {
- if (Constants.DeadReckoning.is
DeadReckoning
) {
+ if (Constants.DeadReckoning.is
UsingTimeToPassDefense
) {
addSequential(new DriveForTime(Constants.DeadReckoning.passRockWallTime,
Constants.DeadReckoning.passRockWallSpeed));
}
addSequential(new DriveForTime(Constants.DeadReckoning.passRockWallTime,
Constants.DeadReckoning.passRockWallSpeed));
}