|
|
|
@ -96,9 +96,7 @@ class CarState(CarStateBase): |
|
|
|
|
ret.cruiseState.standstill = pt_cp.vl["AcceleratorPedal2"]["CruiseState"] == AccState.STANDSTILL |
|
|
|
|
if self.CP.networkLocation == NetworkLocation.fwdCamera: |
|
|
|
|
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 |
|
|
|
|
|
|
|
|
@ -110,7 +108,6 @@ class CarState(CarStateBase): |
|
|
|
|
signals += [ |
|
|
|
|
("AEBCmdActive", "AEBCmd"), |
|
|
|
|
("RollingCounter", "ASCMLKASteeringCmd"), |
|
|
|
|
("FCWAlert", "ASCMActiveCruiseControlStatus"), |
|
|
|
|
("ACCSpeedSetpoint", "ASCMActiveCruiseControlStatus"), |
|
|
|
|
] |
|
|
|
|
checks += [ |
|
|
|
|