|
|
@ -53,6 +53,7 @@ class CarState(CarStateBase): |
|
|
|
ret.cruiseState.speed = cp.vl["DASHBOARD"]["ACC_SPEED_CONFIG_KPH"] * CV.KPH_TO_MS |
|
|
|
ret.cruiseState.speed = cp.vl["DASHBOARD"]["ACC_SPEED_CONFIG_KPH"] * CV.KPH_TO_MS |
|
|
|
# CRUISE_STATE is a three bit msg, 0 is off, 1 and 2 are Non-ACC mode, 3 and 4 are ACC mode, find if there are other states too |
|
|
|
# CRUISE_STATE is a three bit msg, 0 is off, 1 and 2 are Non-ACC mode, 3 and 4 are ACC mode, find if there are other states too |
|
|
|
ret.cruiseState.nonAdaptive = cp.vl["DASHBOARD"]["CRUISE_STATE"] in (1, 2) |
|
|
|
ret.cruiseState.nonAdaptive = cp.vl["DASHBOARD"]["CRUISE_STATE"] in (1, 2) |
|
|
|
|
|
|
|
ret.accFaulted = cp.vl["ACC_2"]["ACC_FAULTED"] != 0 |
|
|
|
|
|
|
|
|
|
|
|
ret.steeringTorque = cp.vl["EPS_STATUS"]["TORQUE_DRIVER"] |
|
|
|
ret.steeringTorque = cp.vl["EPS_STATUS"]["TORQUE_DRIVER"] |
|
|
|
ret.steeringTorqueEps = cp.vl["EPS_STATUS"]["TORQUE_MOTOR"] |
|
|
|
ret.steeringTorqueEps = cp.vl["EPS_STATUS"]["TORQUE_MOTOR"] |
|
|
@ -93,6 +94,7 @@ class CarState(CarStateBase): |
|
|
|
("STEERING_RATE", "STEERING"), |
|
|
|
("STEERING_RATE", "STEERING"), |
|
|
|
("TURN_SIGNALS", "STEERING_LEVERS"), |
|
|
|
("TURN_SIGNALS", "STEERING_LEVERS"), |
|
|
|
("ACC_STATUS_2", "ACC_2"), |
|
|
|
("ACC_STATUS_2", "ACC_2"), |
|
|
|
|
|
|
|
("ACC_FAULTED", "ACC_2"), |
|
|
|
("HIGH_BEAM_FLASH", "STEERING_LEVERS"), |
|
|
|
("HIGH_BEAM_FLASH", "STEERING_LEVERS"), |
|
|
|
("ACC_SPEED_CONFIG_KPH", "DASHBOARD"), |
|
|
|
("ACC_SPEED_CONFIG_KPH", "DASHBOARD"), |
|
|
|
("CRUISE_STATE", "DASHBOARD"), |
|
|
|
("CRUISE_STATE", "DASHBOARD"), |
|
|
|