SmartDashboard.putNumber(Constants.DriveTrain.DRIVE_TARGET_DIST, 50);
SmartDashboard.putNumber(Constants.DriveTrain.MOTOR_VAL, 0.5);
+<<<<<<< HEAD
SmartDashboard.putNumber(Constants.DriveTrain.GYRO_P_Val, 0);
SmartDashboard.putNumber(Constants.DriveTrain.GYRO_I_Val, 0);
SmartDashboard.putNumber(Constants.DriveTrain.GYRO_D_Val, 0);
+=======
+ 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.MOTOR_VAL, 0.5);
+
+ }>>>>>>>
+
+ update code
+
+ double driveP = SmartDashboard.getNumber(Constants.DriveTrain.DRIVE_D_Val,
+ Constants.DriveTrain.PID_ERROR);
+ double driveI = SmartDashboard.getNumber(Constants.DriveTrain.DRIVE_I_Val,
+ Constants.DriveTrain.PID_ERROR);
+ double driveD = SmartDashboard.getNumber(Constants.DriveTrain.DRIVE_D_Val,
+ Constants.DriveTrain.PID_ERROR);
+
+ double gyroP = SmartDashboard.getNumber(Constants.DriveTrain.GYRO_P_Val,
+ Constants.DriveTrain.PID_ERROR);
+ double gyroI = SmartDashboard.getNumber(Constants.DriveTrain.GYRO_I_Val,
+ Constants.DriveTrain.PID_ERROR);
+ double gyroD = SmartDashboard.getNumber(Constants.DriveTrain.GYRO_D_Val,
+ Constants.DriveTrain.PID_ERROR);
+
+ double Setpoint = SmartDashboard.getNumber(
+ Constants.DriveTrain.DRIVE_TARGET_DIST, Constants.DriveTrain.PID_ERROR);
+ double Speed = SmartDashboard.getNumber(
+ Constants.DriveTrain.DRIVE_MOTOR_VAL, Constants.DriveTrain.PID_ERROR);
+
+ driveTrain.getDriveController().setName("Drive");driveTrain.getGyroController().setName("Gyro");
- double driveP = SmartDashboard.getNumber(Constants.DriveTrain.DRIVE_D_Val,
- Constants.DriveTrain.PID_ERROR);
- double driveI = SmartDashboard.getNumber(Constants.DriveTrain.DRIVE_I_Val,
- Constants.DriveTrain.PID_ERROR);
- double driveD = SmartDashboard.getNumber(Constants.DriveTrain.DRIVE_D_Val,
- Constants.DriveTrain.PID_ERROR);
-
- double gyroP = SmartDashboard.getNumber(Constants.DriveTrain.GYRO_P_Val,
- Constants.DriveTrain.PID_ERROR);
- double gyroI = SmartDashboard.getNumber(Constants.DriveTrain.GYRO_I_Val,
- Constants.DriveTrain.PID_ERROR);
- double gyroD = SmartDashboard.getNumber(Constants.DriveTrain.GYRO_D_Val,
- Constants.DriveTrain.PID_ERROR);
-
- double Setpoint = SmartDashboard.getNumber(
- Constants.DriveTrain.DRIVE_TARGET_DIST, Constants.DriveTrain.PID_ERROR);
- double Speed = SmartDashboard.getNumber(
- Constants.DriveTrain.DRIVE_MOTOR_VAL, Constants.DriveTrain.PID_ERROR);
-
- driveTrain.getDriveController().setName("Drive");
- driveTrain.getGyroController().setName("Gyro");
-
- driveTrain.getDriveController().setConstants(driveP, driveI, driveD);
+ driveTrain.getDriveController().setConstants(driveP,driveI,driveD);
}
@Override