Fix conflicts in ToggleGear

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