change gear piston variable names

[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 f25d548a865257b9271de8a1381cdc2f4da85b65..29dc7121ead6f0b2f67cbe0e42e218e49c1a5a02 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -7,6 +7,7 @@ import com.ctre.CANTalon;
 
 import edu.wpi.first.wpilibj.ADXRS450_Gyro;
 import edu.wpi.first.wpilibj.DoubleSolenoid;
+import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
 import edu.wpi.first.wpilibj.Encoder;
 import edu.wpi.first.wpilibj.RobotDrive;
 import edu.wpi.first.wpilibj.command.Subsystem;
@@ -26,7 +27,7 @@ public class DriveTrain extends Subsystem {
   private final CANTalon frontLeft, frontRight, rearLeft, rearRight;
   private final RobotDrive robotDrive;
   private final Encoder leftEncoder, rightEncoder;
-  private final DoubleSolenoid shifter;
+  private final DoubleSolenoid leftGearPiston, rightGearPiston;
 
   private ADXRS450_Gyro imu;
 
@@ -50,8 +51,14 @@ public class DriveTrain extends Subsystem {
     robotDrive = new RobotDrive(frontLeft, rearLeft, frontRight, rearRight);
 
     this.imu = new ADXRS450_Gyro(Constants.DriveTrain.GYRO_PORT);
-    shifter = DoubleSolenoid(10, Constants.DriveTrain.SHIFTER_FORWARD,
-        Constants.DriveTrain.SHIFTER_REVERSE);
+
+    // TODO: Not sure if MODULE_NUMBER should be the same for both
+    leftGearPiston = new DoubleSolenoid(Constants.DriveTrain.MODULE_NUMBER,
+        Constants.DriveTrain.LEFT_GEAR_PISTON_FORWARD,
+        Constants.DriveTrain.LEFT_GEAR_PISTON_REVERSE);
+    rightGearPiston = new DoubleSolenoid(Constants.DriveTrain.MODULE_NUMBER,
+        Constants.DriveTrain.RIGHT_GEAR_PISTON_FORWARD,
+        Constants.DriveTrain.RIGHT_GEAR_PISTON_REVERSE);
   }
 
   public static DriveTrain getDriveTrain() {
@@ -100,6 +107,8 @@ public class DriveTrain extends Subsystem {
     // System.out.println("left: " + getLeftEncoderDistance());
     // System.out.println("right: " + getRightEncoderDistance());
     System.out.println(getAvgEncoderDistance());
+    System.out.println("left: " + getLeftEncoderDistance());
+    System.out.println("right: " + getRightEncoderDistance());
   }
 
   public double getAvgEncoderDistance() {
@@ -136,6 +145,44 @@ public class DriveTrain extends Subsystem {
     return this.gyroZero;
   }
 
+  /*
+   * @return a value that is the current setpoint for the piston kReverse or
+   * KForward
+   */
+  public Value getLeftGearPistonValue() {
+    return leftGearPiston.get();
+  }
+
+  /*
+   * @return a value that is the current setpoint for the piston kReverse or
+   * KForward
+   */
+  public Value getRightGearPistonValue() {
+    return rightGearPiston.get();
+  }
+
+  /*
+   * Changes the ball shift gear assembly to high
+   */
+  public void setHighGear() {
+    changeGear(Constants.DriveTrain.HIGH_GEAR);
+  }
+
+  /*
+   * Changes the ball shift gear assembly to low
+   */
+  public void setLowGear() {
+    changeGear(Constants.DriveTrain.LOW_GEAR);
+  }
+
+  /*
+   * Changes the gear to a DoubleSolenoid.Value
+   */
+  private void changeGear(DoubleSolenoid.Value gear) {
+    leftGearPiston.set(gear);
+    rightGearPiston.set(gear);
+  }
+
   @Override
   protected void initDefaultCommand() {
     setDefaultCommand(new JoystickDrive());