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
/
subsystems
/
DriveTrain.java
diff --git
a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index bad303aebe622f0db77aa8a41d45e79b92c68325..10bc4450fa9c2f41421541d9f43e808ac1d27922 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/
src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@
-170,26
+170,33
@@
public class DriveTrain extends Subsystem {
return rightGearPiston.get();
}
return rightGearPiston.get();
}
+ public DoubleSolenoid getLeftPiston() {
+ return this.leftGearPiston;
+ }
+
+ public DoubleSolenoid getRightPiston() {
+ return this.rightGearPiston;
+ }
+
/*
* Changes the ball shift gear assembly to high
*/
/*
* Changes the ball shift gear assembly to high
*/
- public void setHighGear() {
- changeGear(Constants.DriveTrain.HIGH_GEAR);
+ public void setHighGear(
DoubleSolenoid p
) {
+ changeGear(Constants.DriveTrain.HIGH_GEAR
, p
);
}
/*
* Changes the ball shift gear assembly to low
*/
}
/*
* Changes the ball shift gear assembly to low
*/
- public void setLowGear() {
- changeGear(Constants.DriveTrain.LOW_GEAR);
+ public void setLowGear(
DoubleSolenoid p
) {
+ changeGear(Constants.DriveTrain.LOW_GEAR
, p
);
}
/*
* Changes the gear to a DoubleSolenoid.Value
*/
}
/*
* Changes the gear to a DoubleSolenoid.Value
*/
- private void changeGear(DoubleSolenoid.Value gear) {
- leftGearPiston.set(gear);
- rightGearPiston.set(gear);
+ private void changeGear(DoubleSolenoid.Value gear, DoubleSolenoid piston) {
+ piston.set(gear);
}
@Override
}
@Override