add DRIVE_ to string variables
authorMichael Wang <michaelwang9000@gmail.com>
Sat, 4 Feb 2017 22:56:29 +0000 (14:56 -0800)
committerEric Sandoval <harpnart@gmail.com>
Sun, 19 Feb 2017 18:38:09 +0000 (10:38 -0800)
src/org/usfirst/frc/team3501/robot/Robot.java

index f29237691f0585b7822a5df6ef4f883450fcba92..6d86672832306b8418d148afa7f9a668ada7866a 100644 (file)
@@ -45,10 +45,10 @@ public class Robot extends IterativeRobot {
   public void autonomousInit() {
     driveTrain.setHighGear();
 
-    SmartDashboard.putNumber(Constants.DriveTrain.P_Val, 0);
-    SmartDashboard.putNumber(Constants.DriveTrain.I_Val, 0);
-    SmartDashboard.putNumber(Constants.DriveTrain.D_Val, 0);
-    SmartDashboard.putNumber(Constants.DriveTrain.TARGET_DIST, 50);
+    SmartDashboard.putNumber(Constants.DriveTrain.DRIVE_P_Val, 0);
+    SmartDashboard.putNumber(Constants.DriveTrain.DRIVE_I_Val, 0);
+    SmartDashboard.putNumber(Constants.DriveTrain.DRIVE_D_Val, 0);
+    SmartDashboard.putNumber(Constants.DriveTrain.DRIVE_TARGET_DIST, 50);
     SmartDashboard.putNumber(Constants.DriveTrain.MOTOR_VAL, 0.5);
 
   }
@@ -57,15 +57,15 @@ public class Robot extends IterativeRobot {
   public void autonomousPeriodic() {
     Scheduler.getInstance().run();
 
-    double P = SmartDashboard.getNumber(Constants.DriveTrain.P_Val,
+    double P = SmartDashboard.getNumber(Constants.DriveTrain.DRIVE_P_Val,
         Constants.DriveTrain.PID_ERROR);
-    double I = SmartDashboard.getNumber(Constants.DriveTrain.I_Val,
+    double I = SmartDashboard.getNumber(Constants.DriveTrain.DRIVE_I_Val,
         Constants.DriveTrain.PID_ERROR);
-    double D = SmartDashboard.getNumber(Constants.DriveTrain.D_Val,
+    double D = SmartDashboard.getNumber(Constants.DriveTrain.DRIVE_D_Val,
         Constants.DriveTrain.PID_ERROR);
     double SPEED = SmartDashboard.getNumber(Constants.DriveTrain.MOTOR_VAL, 0);
 
-    double SETPOINT = SmartDashboard.getNumber(Constants.DriveTrain.TARGET_DIST,
+    double SETPOINT = SmartDashboard.getNumber(Constants.DriveTrain.DRIVE_TARGET_DIST,
         Constants.DriveTrain.TARGET_DISTANCE);
 
     DriveTrain.getDriveTrain().getDriveController().setConstants(P, I, D);