fix carstate

This commit is contained in:
MoreTore
2025-11-18 13:57:28 -06:00
parent 53718026b5
commit 1c9dc57f86
+1 -2
View File
@@ -205,15 +205,14 @@ class CarState(CarStateBase):
ret.standstill = cp_cam.vl["SPEED"]["SPEED"] * unit_conversion < 0.1
if self.CP.flags & MazdaFlags.GEN2:
ret.steeringAngleDeg = cp_cam.vl["STEER"]["STEER_ANGLE"]
ret.cruiseState.speed = cp.vl["CRUZE_STATE"]["CRZ_SPEED"] * unit_conversion
ret.cruiseState.enabled = (cp.vl["CRUZE_STATE"]["CRZ_STATE"] >= 2)
ret.cruiseState.available = (cp.vl["CRUZE_STATE"]["CRZ_STATE"] != 0)
else:
ret.steeringAngleDeg = cp.vl["STEER"]["STEER_ANGLE"]
ret.cruiseState.speed = cp_body.vl["CRUZE_STATE"]["CRZ_SPEED"] * unit_conversion
ret.cruiseState.enabled = (cp_body.vl["CRUZE_STATE"]["CRZ_STATE"] >= 3)
ret.cruiseState.available = (cp_body.vl["CRUZE_STATE"]["CRZ_STATE"] >= 2)
ret.steeringAngleDeg = cp.vl["STEER"]["STEER_ANGLE"]
ret.cruiseState.standstill = ret.standstill
ret.steeringRateDeg = (ret.steeringAngleDeg - self._prev_steering_angle) / DT_CTRL
self._prev_steering_angle = ret.steeringAngleDeg