From 28b249559702d052cb4ddfdff2fa0975ab8ff3c5 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh <8762862+adeebshihadeh@users.noreply.github.com> Date: Wed, 24 Jun 2020 14:55:58 -0700 Subject: [PATCH] Hyundai stock adas signals (#1775) * add stockAeb and stockFcw to carstate * bump opendbc * freq check * bump opendbc --- opendbc | 2 +- selfdrive/car/hyundai/carstate.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/opendbc b/opendbc index df1bb08344..1dfdce9f69 160000 --- a/opendbc +++ b/opendbc @@ -1 +1 @@ -Subproject commit df1bb083440804c07d93f84d117d9e625b8fdb5a +Subproject commit 1dfdce9f696b4a93c9e5c66dda8d2d64a80a8fb9 diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py index 6a7bc6bcf0..7dfc357aad 100644 --- a/selfdrive/car/hyundai/carstate.py +++ b/selfdrive/car/hyundai/carstate.py @@ -113,6 +113,9 @@ class CarState(CarStateBase): else: ret.gearShifter = GearShifter.unknown + ret.stockAeb = cp.vl["FCA11"]['FCA_CmdAct'] != 0 + ret.stockFcw = cp.vl["FCA11"]['CF_VSM_Warn'] == 2 + # save the entire LKAS11 and CLU11 self.lkas11 = cp_cam.vl["LKAS11"] self.clu11 = cp.vl["CLU11"] @@ -178,6 +181,9 @@ class CarState(CarStateBase): ("SAS_Angle", "SAS11", 0), ("SAS_Speed", "SAS11", 0), + ("FCA_CmdAct", "FCA11", 0), + ("CF_VSM_Warn", "FCA11", 0), + ("MainMode_ACC", "SCC11", 0), ("VSetDis", "SCC11", 0), ("SCCInfoDisplay", "SCC11", 0), @@ -198,6 +204,7 @@ class CarState(CarStateBase): ("SAS11", 100), ("SCC11", 50), ("SCC12", 50), + ("FCA11", 50), ] if CP.carFingerprint in EV_HYBRID: