|
|
@ -132,7 +132,7 @@ class CarState(CarStateBase): |
|
|
|
if self.CP.carFingerprint in (TSS2_CAR | RADAR_ACC_CAR): |
|
|
|
if self.CP.carFingerprint in (TSS2_CAR | RADAR_ACC_CAR): |
|
|
|
if not (self.CP.flags & ToyotaFlags.SMART_DSU.value): |
|
|
|
if not (self.CP.flags & ToyotaFlags.SMART_DSU.value): |
|
|
|
self.acc_type = cp_acc.vl["ACC_CONTROL"]["ACC_TYPE"] |
|
|
|
self.acc_type = cp_acc.vl["ACC_CONTROL"]["ACC_TYPE"] |
|
|
|
ret.stockFcw = bool(cp_acc.vl["ACC_HUD"]["FCW"]) |
|
|
|
ret.stockFcw = bool(cp_acc.vl["PCS_HUD"]["FCW"]) |
|
|
|
|
|
|
|
|
|
|
|
# some TSS2 cars have low speed lockout permanently set, so ignore on those cars |
|
|
|
# some TSS2 cars have low speed lockout permanently set, so ignore on those cars |
|
|
|
# these cars are identified by an ACC_TYPE value of 2. |
|
|
|
# these cars are identified by an ACC_TYPE value of 2. |
|
|
@ -263,10 +263,10 @@ class CarState(CarStateBase): |
|
|
|
("ACC_CONTROL", 33), |
|
|
|
("ACC_CONTROL", 33), |
|
|
|
] |
|
|
|
] |
|
|
|
signals += [ |
|
|
|
signals += [ |
|
|
|
("FCW", "ACC_HUD"), |
|
|
|
("FCW", "PCS_HUD"), |
|
|
|
] |
|
|
|
] |
|
|
|
checks += [ |
|
|
|
checks += [ |
|
|
|
("ACC_HUD", 1), |
|
|
|
("PCS_HUD", 1), |
|
|
|
] |
|
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
if CP.carFingerprint not in (TSS2_CAR - RADAR_ACC_CAR) and not CP.enableDsu: |
|
|
|
if CP.carFingerprint not in (TSS2_CAR - RADAR_ACC_CAR) and not CP.enableDsu: |
|
|
@ -302,12 +302,12 @@ class CarState(CarStateBase): |
|
|
|
("PRECOLLISION_ACTIVE", "PRE_COLLISION"), |
|
|
|
("PRECOLLISION_ACTIVE", "PRE_COLLISION"), |
|
|
|
("FORCE", "PRE_COLLISION"), |
|
|
|
("FORCE", "PRE_COLLISION"), |
|
|
|
("ACC_TYPE", "ACC_CONTROL"), |
|
|
|
("ACC_TYPE", "ACC_CONTROL"), |
|
|
|
("FCW", "ACC_HUD"), |
|
|
|
("FCW", "PCS_HUD"), |
|
|
|
] |
|
|
|
] |
|
|
|
checks += [ |
|
|
|
checks += [ |
|
|
|
("PRE_COLLISION", 33), |
|
|
|
("PRE_COLLISION", 33), |
|
|
|
("ACC_CONTROL", 33), |
|
|
|
("ACC_CONTROL", 33), |
|
|
|
("ACC_HUD", 1), |
|
|
|
("PCS_HUD", 1), |
|
|
|
] |
|
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
return CANParser(DBC[CP.carFingerprint]["pt"], signals, checks, 2) |
|
|
|
return CANParser(DBC[CP.carFingerprint]["pt"], signals, checks, 2) |
|
|
|