From b69da5bd88804870452f43b7c5894d72ff207a72 Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Sat, 4 Feb 2017 14:56:29 -0800 Subject: [PATCH] add DRIVE_ to string variables --- src/org/usfirst/frc/team3501/robot/Robot.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index f292376..6d86672 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -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); -- 2.30.2