|
|
|
@ -148,7 +148,6 @@ class CarState(CarStateBase): |
|
|
|
|
self.shifter_values = can_define.dv[self.gearbox_msg]["GEAR_SHIFTER"] |
|
|
|
|
self.steer_status_values = defaultdict(lambda: "UNKNOWN", can_define.dv["STEER_STATUS"]["STEER_STATUS"]) |
|
|
|
|
|
|
|
|
|
self.brake_error = False |
|
|
|
|
self.brake_switch_prev = False |
|
|
|
|
self.brake_switch_active = False |
|
|
|
|
self.cruise_setting = 0 |
|
|
|
@ -195,9 +194,9 @@ class CarState(CarStateBase): |
|
|
|
|
ret.steerFaultTemporary = steer_status not in ("NORMAL", "LOW_SPEED_LOCKOUT", "NO_TORQUE_ALERT_2") |
|
|
|
|
|
|
|
|
|
if self.CP.carFingerprint in HONDA_BOSCH_RADARLESS: |
|
|
|
|
self.brake_error = cp.vl["CRUISE_FAULT_STATUS"]["CRUISE_FAULT"] |
|
|
|
|
ret.accFaulted = bool(cp.vl["CRUISE_FAULT_STATUS"]["CRUISE_FAULT"]) |
|
|
|
|
elif self.CP.openpilotLongitudinalControl: |
|
|
|
|
self.brake_error = cp.vl["STANDSTILL"]["BRAKE_ERROR_1"] or cp.vl["STANDSTILL"]["BRAKE_ERROR_2"] |
|
|
|
|
ret.accFaulted = bool(cp.vl["STANDSTILL"]["BRAKE_ERROR_1"] or cp.vl["STANDSTILL"]["BRAKE_ERROR_2"]) |
|
|
|
|
ret.espDisabled = cp.vl["VSA_STATUS"]["ESP_DISABLED"] != 0 |
|
|
|
|
|
|
|
|
|
ret.wheelSpeeds = self.get_wheel_speeds( |
|
|
|
|