diff --git a/selfdrive/car/chrysler/interface.py b/selfdrive/car/chrysler/interface.py index cb7784cc663ddb..55c89dceef1e47 100755 --- a/selfdrive/car/chrysler/interface.py +++ b/selfdrive/car/chrysler/interface.py @@ -82,7 +82,6 @@ def _get_params(ret, candidate, fingerprint, car_fw, experimental_long, docs): ret.mass = 3405. + STD_CARGO_KG ret.minSteerSpeed = 16 CarInterfaceBase.configure_torque_tune(candidate, ret.lateralTuning, 1.0, False) - ret.flags |= ChryslerFlags.SP_RAM_HD_FIXED_STEERING_RATIO.value else: raise ValueError(f"Unsupported car: {candidate}") diff --git a/selfdrive/car/chrysler/values.py b/selfdrive/car/chrysler/values.py index 566a210ad5577f..c8540c8a599d2b 100644 --- a/selfdrive/car/chrysler/values.py +++ b/selfdrive/car/chrysler/values.py @@ -14,8 +14,6 @@ class ChryslerFlags(IntFlag): HIGHER_MIN_STEERING_SPEED = 1 - SP_RAM_HD_FIXED_STEERING_RATIO = 2 - class CAR: # Chrysler diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index bff6b971fd65c0..a61e12c6d3cba5 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -606,7 +606,7 @@ def state_control(self, CS): lp = self.sm['liveParameters'] x = max(lp.stiffnessFactor, 0.1) sr = max(lp.steerRatio, 0.1) - self.VM.update_params(x, sr, self.CP) + self.VM.update_params(x, sr) # Update Torque Params if self.CP.lateralTuning.which() == 'torque': diff --git a/selfdrive/controls/lib/vehicle_model.py b/selfdrive/controls/lib/vehicle_model.py index 1c24dc63aebc3f..0750384918dc31 100755 --- a/selfdrive/controls/lib/vehicle_model.py +++ b/selfdrive/controls/lib/vehicle_model.py @@ -19,8 +19,6 @@ from cereal import car -from selfdrive.car.chrysler.values import ChryslerFlags - ACCELERATION_DUE_TO_GRAVITY = 9.8 @@ -40,14 +38,13 @@ def __init__(self, CP: car.CarParams): self.cF_orig: float = CP.tireStiffnessFront self.cR_orig: float = CP.tireStiffnessRear - self.chrysler_ram_hd: bool = (CP.carName == "chrysler") and CP.flags & ChryslerFlags.SP_RAM_HD_FIXED_STEERING_RATIO.value - self.update_params(1.0, CP.steerRatio, CP) + self.update_params(1.0, CP.steerRatio) - def update_params(self, stiffness_factor: float, steer_ratio: float, CP: car.CarParams) -> None: + def update_params(self, stiffness_factor: float, steer_ratio: float) -> None: """Update the vehicle model with a new stiffness factor and steer ratio""" self.cF: float = stiffness_factor * self.cF_orig self.cR: float = stiffness_factor * self.cR_orig - self.sR: float = CP.steerRatio if self.chrysler_ram_hd else steer_ratio + self.sR: float = steer_ratio def steady_state_sol(self, sa: float, u: float, roll: float) -> np.ndarray: """Returns the steady state solution.