Fix merge conflicts

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index c2571ec7174649079463968e204cdae561a25990..16ed17c47527bb4e051eb3e038258fa8bfa4e547 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -98,7 +98,6 @@ public class OI /* implements KeyListener */ {
     coastCANTalons = new JoystickButton(rightJoystick,
         Constants.OI.COAST_CANTALONS_PORT);
     coastCANTalons.whenPressed(new CoastCANTalons());
-
   }
 
   public static OI getOI() {

diff --git a/src/org/usfirst/frc/team3501/robot/commands/driving/ToggleDrivePiston.java b/src/org/usfirst/frc/team3501/robot/commands/driving/ToggleDrivePiston.java
deleted file mode 100644 (file)
index ad13cc0..0000000
--- a/src/org/usfirst/frc/team3501/robot/commands/driving/ToggleDrivePiston.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.driving;
-
-import org.usfirst.frc.team3501.robot.Constants;
-import org.usfirst.frc.team3501.robot.Robot;
-import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
-import edu.wpi.first.wpilibj.command.Command;
-
-public class ToggleDrivePiston extends Command {
-  private DriveTrain driveTrain = Robot.getDriveTrain();
-
-  /**
-   * See JavaDoc comment in class for details
-   *
-   * @param motorVal
-   *          value range from -1 to 1
-   */
-  public ToggleDrivePiston() {
-    requires(driveTrain);
-  }
-
-  // Called just before this Command runs the first time
-  @Override
-  protected void initialize() {
-  }
-
-  // Called repeatedly when this Command is scheduled to run
-  @Override
-  protected void execute() {
-    if (DriveTrain.getDriveTrain()
-        .getLeftGearPistonValue() == Constants.DriveTrain.HIGH_GEAR) {
-      DriveTrain.getDriveTrain().setLowGear();
-    } else {
-      DriveTrain.getDriveTrain().setHighGear();
-    }
-
-    // check to make sure that both pistons are set to the same gear. Otherwise,
-    // the code must be changed
-  }
-
-  // Called once after isFinished returns true
-  @Override
-  protected void end() {
-  }
-
-  // Called when another command which requires one or more of the same
-  // subsystems is scheduled to run
-  @Override
-  protected void interrupted() {
-    end();
-  }
-
-  @Override
-  protected boolean isFinished() {
-    return false;
-
-  }
-
-}

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) {
-      driveTrain.setHighGear();
+      driveTrain.setHighGear(driveTrain.getLeftPiston());
     } else {
-      driveTrain.setLowGear();
+      driveTrain.setLowGear(driveTrain.getLeftPiston());
+    }
+
+    if (rightGearPistonValue == Constants.DriveTrain.LOW_GEAR) {
+      driveTrain.setHighGear(driveTrain.getRightPiston());
+    } else {
+      driveTrain.setLowGear(driveTrain.getRightPiston());
     }
 
   }

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();
   }
 
+  public DoubleSolenoid getLeftPiston() {
+    return this.leftGearPiston;
+  }
+
+  public DoubleSolenoid getRightPiston() {
+    return this.rightGearPiston;
+  }
+
   /*
    * 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
    */
-  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
    */
-  private void changeGear(DoubleSolenoid.Value gear) {
-    leftGearPiston.set(gear);
-    rightGearPiston.set(gear);
+  private void changeGear(DoubleSolenoid.Value gear, DoubleSolenoid piston) {
+    piston.set(gear);
   }
 
   @Override