From e00cc4acfeb5900e49f3477a9bd404ebb1305202 Mon Sep 17 00:00:00 2001 From: Eric Sandoval Date: Sat, 4 Feb 2017 15:11:28 -0800 Subject: [PATCH] update code --- .../frc/team3501/robot/commands/driving/TurnForAngle.java | 7 ------- 1 file changed, 7 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 e5e9ff2..c2e1b6e 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java +++ b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java @@ -37,15 +37,8 @@ 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); } -- 2.30.2