From 665abef7e0ac91a16b508c9f628de0daaf3643ca Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Thu, 9 Feb 2017 19:55:01 -0800 Subject: [PATCH] fix errors --- .../team3501/robot/subsystems/DriveTrain.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java index 6d4f020..d8d56aa 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java @@ -20,6 +20,18 @@ public class DriveTrain extends Subsystem { public static double driveStraightGyroP = 0.01; + public static final String DRIVE_P_Val = "DriveP"; + public static final String DRIVE_I_Val = "DriveI"; + public static final String DRIVE_D_Val = "DriveD"; + public static final String DRIVE_TARGET_DIST = "SET_DIST"; + public static final String DRIVE_MOTOR_VAL = "SPEED"; + public static final String GYRO_P_Val = "GyroP"; + public static final String GYRO_I_Val = "GyroI"; + public static final String GYRO_D_Val = "GyroD"; + public static final String GYRO_TARGET_ANGLE = "SET_ANGLE"; + public static final int PID_ERROR = -1; + public static final int TARGET_DISTANCE_ERROR = -1; + public static final double WHEEL_DIAMETER = 6; // inches public static final int ENCODER_PULSES_PER_REVOLUTION = 256; public static final double INCHES_PER_PULSE = WHEEL_DIAMETER * Math.PI @@ -50,18 +62,6 @@ public class DriveTrain extends Subsystem { // PID TUNING - public static final String DRIVE_P_Val = "DriveP"; - public static final String DRIVE_I_Val = "DriveI"; - public static final String DRIVE_D_Val = "DriveD"; - public static final String DRIVE_TARGET_DIST = "SET_DIST"; - public static final String DRIVE_MOTOR_VAL = "SPEED"; - public static final String GYRO_P_Val = "GyroP"; - public static final String GYRO_I_Val = "GyroI"; - public static final String GYRO_D_Val = "GyroD"; - public static final String GYRO_TARGET_ANGLE = "SET_ANGLE"; - public static final int PID_ERROR = -1; - public static final int TARGET_DISTANCE_ERROR = -1; - // MOTOR CONTROLLERS frontLeft = new CANTalon(Constants.DriveTrain.FRONT_LEFT); frontRight = new CANTalon(Constants.DriveTrain.FRONT_RIGHT); -- 2.30.2