|
|
@ -179,7 +179,7 @@ class CarState(CarStateBase): |
|
|
|
return CarState.get_can_parser_hda2(CP) |
|
|
|
return CarState.get_can_parser_hda2(CP) |
|
|
|
|
|
|
|
|
|
|
|
signals = [ |
|
|
|
signals = [ |
|
|
|
# sig_name, sig_address |
|
|
|
# signal_name, signal_address |
|
|
|
("WHL_SPD_FL", "WHL_SPD11"), |
|
|
|
("WHL_SPD_FL", "WHL_SPD11"), |
|
|
|
("WHL_SPD_FR", "WHL_SPD11"), |
|
|
|
("WHL_SPD_FR", "WHL_SPD11"), |
|
|
|
("WHL_SPD_RL", "WHL_SPD11"), |
|
|
|
("WHL_SPD_RL", "WHL_SPD11"), |
|
|
@ -191,9 +191,9 @@ class CarState(CarStateBase): |
|
|
|
|
|
|
|
|
|
|
|
("CF_Gway_DrvSeatBeltSw", "CGW1"), |
|
|
|
("CF_Gway_DrvSeatBeltSw", "CGW1"), |
|
|
|
("CF_Gway_DrvDrSw", "CGW1"), # Driver Door |
|
|
|
("CF_Gway_DrvDrSw", "CGW1"), # Driver Door |
|
|
|
("CF_Gway_AstDrSw", "CGW1"), # Passenger door |
|
|
|
("CF_Gway_AstDrSw", "CGW1"), # Passenger Door |
|
|
|
("CF_Gway_RLDrSw", "CGW2"), # Rear reft door |
|
|
|
("CF_Gway_RLDrSw", "CGW2"), # Rear left Door |
|
|
|
("CF_Gway_RRDrSw", "CGW2"), # Rear right door |
|
|
|
("CF_Gway_RRDrSw", "CGW2"), # Rear right Door |
|
|
|
("CF_Gway_TurnSigLh", "CGW1"), |
|
|
|
("CF_Gway_TurnSigLh", "CGW1"), |
|
|
|
("CF_Gway_TurnSigRh", "CGW1"), |
|
|
|
("CF_Gway_TurnSigRh", "CGW1"), |
|
|
|
("CF_Gway_ParkBrakeSw", "CGW1"), |
|
|
|
("CF_Gway_ParkBrakeSw", "CGW1"), |
|
|
@ -231,7 +231,6 @@ class CarState(CarStateBase): |
|
|
|
("SAS_Angle", "SAS11"), |
|
|
|
("SAS_Angle", "SAS11"), |
|
|
|
("SAS_Speed", "SAS11"), |
|
|
|
("SAS_Speed", "SAS11"), |
|
|
|
] |
|
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
checks = [ |
|
|
|
checks = [ |
|
|
|
# address, frequency |
|
|
|
# address, frequency |
|
|
|
("MDPS12", 50), |
|
|
|
("MDPS12", 50), |
|
|
@ -254,7 +253,6 @@ class CarState(CarStateBase): |
|
|
|
("ACC_ObjDist", "SCC11"), |
|
|
|
("ACC_ObjDist", "SCC11"), |
|
|
|
("ACCMode", "SCC12"), |
|
|
|
("ACCMode", "SCC12"), |
|
|
|
] |
|
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
checks += [ |
|
|
|
checks += [ |
|
|
|
("SCC11", 50), |
|
|
|
("SCC11", 50), |
|
|
|
("SCC12", 50), |
|
|
|
("SCC12", 50), |
|
|
@ -316,7 +314,7 @@ class CarState(CarStateBase): |
|
|
|
return None |
|
|
|
return None |
|
|
|
|
|
|
|
|
|
|
|
signals = [ |
|
|
|
signals = [ |
|
|
|
# sig_name, sig_address |
|
|
|
# signal_name, signal_address |
|
|
|
("CF_Lkas_LdwsActivemode", "LKAS11"), |
|
|
|
("CF_Lkas_LdwsActivemode", "LKAS11"), |
|
|
|
("CF_Lkas_LdwsSysState", "LKAS11"), |
|
|
|
("CF_Lkas_LdwsSysState", "LKAS11"), |
|
|
|
("CF_Lkas_SysWarning", "LKAS11"), |
|
|
|
("CF_Lkas_SysWarning", "LKAS11"), |
|
|
@ -333,7 +331,6 @@ class CarState(CarStateBase): |
|
|
|
("CF_Lkas_FcwOpt_USM", "LKAS11"), |
|
|
|
("CF_Lkas_FcwOpt_USM", "LKAS11"), |
|
|
|
("CF_Lkas_LdwsOpt_USM", "LKAS11"), |
|
|
|
("CF_Lkas_LdwsOpt_USM", "LKAS11"), |
|
|
|
] |
|
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
checks = [ |
|
|
|
checks = [ |
|
|
|
("LKAS11", 100) |
|
|
|
("LKAS11", 100) |
|
|
|
] |
|
|
|
] |
|
|
|