From 09ee7387408cca6dd3a57ee5a8faca1959e85639 Mon Sep 17 00:00:00 2001 From: Eric Sandoval Date: Sat, 4 Feb 2017 15:06:06 -0800 Subject: [PATCH] update code --- src/org/usfirst/frc/team3501/robot/Robot.java | 1 + .../frc/team3501/robot/commands/driving/TurnForAngle.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index 3cf893e..bc7966f 100644 --- 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 83788d7..e5e9ff2 100755 --- 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); } -- 2.30.2