projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix merge conflicts
[3501/2017steamworks]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
commands
/
driving
/
ToggleGear.java
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/driving/ToggleGear.java
b/src/org/usfirst/frc/team3501/robot/commands/driving/ToggleGear.java
index ca802e705291cff2ebd02ae5658a25f9998dd840..8fa8bc7529a443a76150c9d6e681430521a4f63a 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/driving/ToggleGear.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/driving/ToggleGear.java
@@
-31,9
+31,15
@@
public class ToggleGear extends Command {
Value rightGearPistonValue = driveTrain.getRightGearPistonValue();
if (leftGearPistonValue == Constants.DriveTrain.LOW_GEAR) {
Value rightGearPistonValue = driveTrain.getRightGearPistonValue();
if (leftGearPistonValue == Constants.DriveTrain.LOW_GEAR) {
- driveTrain.setHighGear();
+ driveTrain.setHighGear(
driveTrain.getLeftPiston()
);
} else {
} else {
- driveTrain.setLowGear();
+ driveTrain.setLowGear(driveTrain.getLeftPiston());
+ }
+
+ if (rightGearPistonValue == Constants.DriveTrain.LOW_GEAR) {
+ driveTrain.setHighGear(driveTrain.getRightPiston());
+ } else {
+ driveTrain.setLowGear(driveTrain.getRightPiston());
}
}
}
}