|
|
@ -100,6 +100,10 @@ class CarState(CarStateBase): |
|
|
|
# 2 is standby, 10 is active. TODO: check that everything else is really a faulty state |
|
|
|
# 2 is standby, 10 is active. TODO: check that everything else is really a faulty state |
|
|
|
self.steer_state = cp.vl["EPS_STATUS"]['LKA_STATE'] |
|
|
|
self.steer_state = cp.vl["EPS_STATUS"]['LKA_STATE'] |
|
|
|
self.steer_warning = cp.vl["EPS_STATUS"]['LKA_STATE'] not in [1, 5] |
|
|
|
self.steer_warning = cp.vl["EPS_STATUS"]['LKA_STATE'] not in [1, 5] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if self.CP.carFingerprint in TSS2_CAR: |
|
|
|
|
|
|
|
ret.leftBlindspot = cp.vl["BSM"]['L_ADJACENT'] == 1 |
|
|
|
|
|
|
|
ret.rightBlindspot = cp.vl["BSM"]['R_ADJACENT'] == 1 |
|
|
|
|
|
|
|
|
|
|
|
return ret |
|
|
|
return ret |
|
|
|
|
|
|
|
|
|
|
@ -164,7 +168,11 @@ class CarState(CarStateBase): |
|
|
|
signals.append(("INTERCEPTOR_GAS", "GAS_SENSOR", 0)) |
|
|
|
signals.append(("INTERCEPTOR_GAS", "GAS_SENSOR", 0)) |
|
|
|
signals.append(("INTERCEPTOR_GAS2", "GAS_SENSOR", 0)) |
|
|
|
signals.append(("INTERCEPTOR_GAS2", "GAS_SENSOR", 0)) |
|
|
|
checks.append(("GAS_SENSOR", 50)) |
|
|
|
checks.append(("GAS_SENSOR", 50)) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if CP.carFingerprint in TSS2_CAR: |
|
|
|
|
|
|
|
signals += [("L_ADJACENT", "BSM", 0)] |
|
|
|
|
|
|
|
signals += [("R_ADJACENT", "BSM", 0)] |
|
|
|
|
|
|
|
|
|
|
|
return CANParser(DBC[CP.carFingerprint]['pt'], signals, checks, 0) |
|
|
|
return CANParser(DBC[CP.carFingerprint]['pt'], signals, checks, 0) |
|
|
|
|
|
|
|
|
|
|
|
@staticmethod |
|
|
|
@staticmethod |
|
|
|