diff --git a/selfdrive/controls/lib/latcontrol_curvature.py b/selfdrive/controls/lib/latcontrol_curvature.py index 422762322..720b76209 100644 --- a/selfdrive/controls/lib/latcontrol_curvature.py +++ b/selfdrive/controls/lib/latcontrol_curvature.py @@ -32,14 +32,11 @@ class LatControlCurvature(LatControl): actual_curvature_pose = calibrated_pose.angular_velocity.yaw / CS.vEgo actual_curvature = np.interp(CS.vEgo, [2.0, 5.0], [actual_curvature_vm, actual_curvature_pose]) - curvature_correction = CS.curvature - actual_curvature if self.useCarCurvature else 0. + curvature_car_correction = CS.curvature - desired_curvature if self.useCarCurvature else 0. roll_compensation = -VM.roll_compensation(params.roll, CS.vEgo) - correction = curvature_correction - roll_compensation - - desired_curvature_corr = desired_curvature + correction - actual_curvature_corr = actual_curvature + correction + desired_curvature_corr = desired_curvature + curvature_car_correction - roll_compensation - pid_log.error = float(desired_curvature_corr - actual_curvature_corr) + pid_log.error = float(desired_curvature_corr - actual_curvature) freeze_integrator = steer_limited_by_controls or CS.steeringPressed or CS.vEgo < 5 output_curvature = self.pid.update(pid_log.error, feedforward=desired_curvature_corr, speed=CS.vEgo, freeze_integrator=freeze_integrator)