fix alot of unnecessary/not used code and init gyroController

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

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 add95564848a6857e5df98c002992a610d619572..83788d7ed40e585b36c73549401bc71fdcd98f30 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
@@ -32,6 +32,10 @@ public class TurnForAngle extends Command {
     this.direction = direction;
     this.maxTimeOut = maxTimeOut;
     this.target = Math.abs(angle);
+<<<<<<< HEAD
+=======
+    this.zeroAngle = driveTrain.getAngle();
+>>>>>>> fix alot of unnecessary/not used code and init gyroController
 
     this.gyroController = Robot.getDriveTrain().getGyroController();
     this.gyroController.setDoneRange(1);