projects / 3501 / 2017steamworks / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 63c60c7)
fix errors
authorMichael Wang <michaelwang9000@gmail.com>
Fri, 10 Feb 2017 03:55:01 +0000 (19:55 -0800)
committerEric Sandoval <harpnart@gmail.com>
Sun, 19 Feb 2017 18:41:08 +0000 (10:41 -0800)
src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java patch | blob | blame | history

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index 6d4f02040b169c942718e3ef30f9d3d239e2d0ad..d8d56aa519bae9aa41d0f0563e7ed2a9b08ea904 100644 (file)
--- 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);