|
|
@ -92,6 +92,9 @@ class CarState(CarStateBase): |
|
|
|
if self.CP.networkLocation == NetworkLocation.fwdCamera: |
|
|
|
if self.CP.networkLocation == NetworkLocation.fwdCamera: |
|
|
|
ret.cruiseState.speed = cam_cp.vl["ASCMActiveCruiseControlStatus"]["ACCSpeedSetpoint"] * CV.KPH_TO_MS |
|
|
|
ret.cruiseState.speed = cam_cp.vl["ASCMActiveCruiseControlStatus"]["ACCSpeedSetpoint"] * CV.KPH_TO_MS |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ret.stockAeb = cam_cp.vl["AEBCmd"]["AEBCmdActive"] != 0 |
|
|
|
|
|
|
|
ret.stockFcw = cam_cp.vl["ASCMActiveCruiseControlStatus"]["FCWAlert"] != 0 |
|
|
|
|
|
|
|
|
|
|
|
return ret |
|
|
|
return ret |
|
|
|
|
|
|
|
|
|
|
|
@staticmethod |
|
|
|
@staticmethod |
|
|
@ -100,10 +103,13 @@ class CarState(CarStateBase): |
|
|
|
checks = [] |
|
|
|
checks = [] |
|
|
|
if CP.networkLocation == NetworkLocation.fwdCamera: |
|
|
|
if CP.networkLocation == NetworkLocation.fwdCamera: |
|
|
|
signals += [ |
|
|
|
signals += [ |
|
|
|
|
|
|
|
("AEBCmdActive", "AEBCmd"), |
|
|
|
("RollingCounter", "ASCMLKASteeringCmd"), |
|
|
|
("RollingCounter", "ASCMLKASteeringCmd"), |
|
|
|
|
|
|
|
("FCWAlert", "ASCMActiveCruiseControlStatus"), |
|
|
|
("ACCSpeedSetpoint", "ASCMActiveCruiseControlStatus"), |
|
|
|
("ACCSpeedSetpoint", "ASCMActiveCruiseControlStatus"), |
|
|
|
] |
|
|
|
] |
|
|
|
checks += [ |
|
|
|
checks += [ |
|
|
|
|
|
|
|
("AEBCmd", 10), |
|
|
|
("ASCMLKASteeringCmd", 10), |
|
|
|
("ASCMLKASteeringCmd", 10), |
|
|
|
("ASCMActiveCruiseControlStatus", 25), |
|
|
|
("ASCMActiveCruiseControlStatus", 25), |
|
|
|
] |
|
|
|
] |
|
|
|