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 2b77348e781bf917e5755b9464b9b2bb168edee7..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,20 +30,6 @@ public class DriveDistance extends Command {
   private double driveI;
   private double driveD;
 
-  public DriveDistance(double distance, double maxTimeOut) {
-    requires(driveTrain);
-    this.maxTimeOut = maxTimeOut;
-    this.target = distance;
-
-  private double target;
-  private double gyroP;
-  private double gyroI;
-  private double gyroD;
-
-  private double driveP;
-  private double driveI;
-  private double driveD;
-
   public DriveDistance(double distance, double motorVal) {
     requires(driveTrain);
     this.maxTimeOut = maxTimeOut;
@@ -91,13 +77,6 @@ public class DriveDistance extends Command {
 
     driveTrain.printEncoderOutput();
     // 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);
   }
 
   @Override