update code

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 3cf893ea0e57c241511f028c70abe13ba2753e27..bc7966fb1d5910e929ccd38f166fb2d6b0a01335 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -83,6 +83,7 @@ public class Robot extends IterativeRobot {
     driveTrain.getDriveController().setConstants(driveP, driveI, driveD);
 
     driveTrain.getGyroController().setConstants(gyroP, gyroI, gyroD);
+
   }
 
   @Override

diff --git a/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
index 83788d7ed40e585b36c73549401bc71fdcd98f30..e5e9ff2a760f02e7da62c16ef2502d512729be81 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
@@ -37,7 +37,15 @@ public class TurnForAngle extends Command {
     this.zeroAngle = driveTrain.getAngle();
 >>>>>>> fix alot of unnecessary/not used code and init gyroController
 
+<<<<<<< 3921ddf563ce7727724494c62d65c2ca0e8ff8cc
     this.gyroController = Robot.getDriveTrain().getGyroController();
+=======
+    this.gyroP = driveTrain.turnP;
+    this.gyroI = driveTrain.turnI;
+    this.gyroD = driveTrain.turnD;
+
+    this.gyroController = Robot.getDriveTrain().getDriveController();
+>>>>>>> update code
     this.gyroController.setDoneRange(1);
     this.gyroController.setMinDoneCycles(5);
   }