finish transferring code

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 b569958fafa4cb432d120f85a4b9981fed390e80..76bc52fef569641a5b3c7a2d1c8d9cc592602505 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/commands/driving/DriveDistance.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/driving/DriveDistance.java
@@ -1,5 +1,6 @@
 package org.usfirst.frc.team3501.robot.commands.driving;
 
+import org.usfirst.frc.team3501.robot.MathLib;
 import org.usfirst.frc.team3501.robot.Robot;
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
 import org.usfirst.frc.team3501.robot.utils.PIDController;
@@ -35,6 +36,17 @@ public class DriveDistance extends Command {
     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.driveP = driveTrain.driveP;
     this.driveI = driveTrain.driveI;
     this.driveD = driveTrain.driveD;
@@ -76,6 +88,14 @@ public class DriveDistance extends Command {
     this.driveTrain.setMotorValues(leftDrive, rightDrive);
 
     driveTrain.printEncoderOutput();
+    // System.out.println("turn: " + xVal);
+    double leftDrive = MathLib.calcLeftTankDrive(-xVal, yVal);
+    double rightDrive = MathLib.calcRightTankDrive(xVal, -yVal);
+
+    this.driveTrain.setMotorValues(leftDrive, rightDrive);
+
+    System.out.println(driveTrain.getAvgEncoderDistance());
+    // System.out.println("motorval: " + yVal);
   }
 
   @Override

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index 54324f050caab86d9ac9870ca11dace772b6a63c..fd6530e5404d26a08985c7abe5df66f555e69af6 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -2,6 +2,7 @@ package org.usfirst.frc.team3501.robot.subsystems;
 
 import org.usfirst.frc.team3501.robot.Constants;
 import org.usfirst.frc.team3501.robot.commands.driving.JoystickDrive;
+import org.usfirst.frc.team3501.robot.utils.BNO055;
 
 import com.ctre.CANTalon;
 
@@ -16,6 +17,9 @@ public class DriveTrain extends Subsystem {
   public static double driveP = 0.006, driveI = 0.001, driveD = -0.002;
   public static double defaultGyroP = 0.004, defaultGyroI = 0.0013,
       defaultGyroD = -0.005;
+  public static double driveP = 0.008, driveI = 0.001, driveD = -0.002;
+  public static double defaultGyroP = 0.009, defaultGyroI = 0.00000,
+      defaultGyroD = -0.000;
   private double gyroZero = 0;
 
   public static final double WHEEL_DIAMETER = 6; // inches
@@ -30,6 +34,7 @@ public class DriveTrain extends Subsystem {
   private final DoubleSolenoid leftGearPiston, rightGearPiston;
 
   private ADXRS450_Gyro imu;
+  private BNO055 imu;
 
   private DriveTrain() {
     // MOTOR CONTROLLERS
@@ -177,6 +182,21 @@ public class DriveTrain extends Subsystem {
     rightGearPiston.set(gear);
   }
 
+  public double getAngle() {
+    if (!this.imu.isInitialized())
+      return -1;
+    return this.imu.getHeading() - this.gyroZero;
+  }
+
+  public void resetGyro() {
+    this.gyroZero = this.getAngle();
+
+  }
+
+  public double getZeroAngle() {
+    return this.gyroZero;
+  }
+
   @Override
   protected void initDefaultCommand() {
     setDefaultCommand(new JoystickDrive());