Fix conflicts from rebase

[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 54324f050caab86d9ac9870ca11dace772b6a63c..7784854220a2994b4134c2bc9bb5c1bc624fc7bc 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -51,8 +51,7 @@ 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);
+
     leftGearPiston = new DoubleSolenoid(Constants.DriveTrain.MODULE_NUMBER,
         Constants.DriveTrain.LEFT_FORWARD, Constants.DriveTrain.LEFT_REVERSE);
     rightGearPiston = new DoubleSolenoid(Constants.DriveTrain.MODULE_NUMBER,
@@ -105,6 +104,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() {
@@ -139,6 +140,8 @@ public class DriveTrain extends Subsystem {
 
   public double getZeroAngle() {
     return this.gyroZero;
+  }
+
   /*
    * @return a value that is the current setpoint for the piston kReverse or
    * KForward
@@ -148,8 +151,8 @@ public class DriveTrain extends Subsystem {
   }
 
   /*
-   * @return a value that is the current setppoint for the piston kReverse or
-   * kForward
+   * @return a value that is the current setpoint for the piston kReverse or
+   * KForward
    */
   public Value getRightGearPistonValue() {
     return rightGearPiston.get();