From b95024be2a6fa7f3516ed49318c690236f542afb Mon Sep 17 00:00:00 2001 From: EvanYap Date: Sat, 4 Feb 2017 15:25:54 -0800 Subject: [PATCH] fix alot of unnecessary/not used code and init gyroController --- .../frc/team3501/robot/commands/driving/TurnForAngle.java | 4 ---- 1 file changed, 4 deletions(-) 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 2f9d364..c2e1b6e 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java +++ b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java @@ -39,10 +39,6 @@ public class TurnForAngle extends Command { this.gyroController = Robot.getDriveTrain().getGyroController(); -<<<<<<< c56ee177a9387e78474e35cbaa7355c443d5ae8a -======= - this.gyroController = Robot.getDriveTrain().getGyroController(); ->>>>>>> add seperate pid controllers this.gyroController.setDoneRange(1); this.gyroController.setMinDoneCycles(5); } -- 2.30.2