Fix conflicts from rebase

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / commands / driving / DriveDistance.java

diff --git a/src/org/usfirst/frc/team3501/robot/commands/driving/DriveDistance.java b/src/org/usfirst/frc/team3501/robot/commands/driving/DriveDistance.java
index 5c0c20b92a7ee20f2a83d0fbaec3da6792462aba..ed1347f7325be8efe98cf9713558645cb854cd99 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/commands/driving/DriveDistance.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/driving/DriveDistance.java
@@ -30,7 +30,7 @@ public class DriveDistance extends Command {
   private double driveI;
   private double driveD;
 
-  public DriveDistance(double distance, double maxTimeOut) {
+  public DriveDistance(double distance, double motorVal) {
     requires(driveTrain);
     this.maxTimeOut = maxTimeOut;
     this.target = distance;
@@ -70,14 +70,13 @@ public class DriveDistance extends Command {
       xVal = -this.gyroController
           .calcPID(this.driveTrain.getAngle() - this.driveTrain.getZeroAngle());
     }
-    // System.out.println("turn: " + xVal);
     double leftDrive = yVal - xVal;
     double rightDrive = yVal + xVal;
 
     this.driveTrain.setMotorValues(leftDrive, rightDrive);
 
     driveTrain.printEncoderOutput();
-    // System.out.println("motorval: " + yVal);
+    // System.out.println("turn: " + xVal);
   }
 
   @Override