From 059a27d12697e48b10c00fc345812704d7ba4640 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 2 Aug 2020 15:19:27 -0700 Subject: [PATCH] Update Hyundai DBC (#1968) * update for new DBC update * update to new DBC * Ioniq uses SCC12. Ioniq EV lim uses FCA11 * update elect gear to EV_PC5 signal * remove 'alt' from label * revert * update name to ev_pc5_gears * update name to use_ev_pc5_gears * Update values.py * Update carstate.py * bump opendbc Co-authored-by: xps-genesis <65239463+xps-genesis@users.noreply.github.com> --- opendbc | 2 +- selfdrive/car/hyundai/carstate.py | 2 +- selfdrive/car/hyundai/hyundaican.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/opendbc b/opendbc index a59f03c179..b7cf1a67bc 160000 --- a/opendbc +++ b/opendbc @@ -1 +1 @@ -Subproject commit a59f03c179587573924edc03bacfc5aa3f77d83d +Subproject commit b7cf1a67bc71b674e6793ba1f2fff5d29fee1e6b diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py index 8141056811..61d9de05bb 100644 --- a/selfdrive/car/hyundai/carstate.py +++ b/selfdrive/car/hyundai/carstate.py @@ -281,7 +281,7 @@ class CarState(CarStateBase): signals = [ # sig_name, sig_address, default - ("CF_Lkas_Bca_R", "LKAS11", 0), + ("CF_Lkas_LdwsActivemode", "LKAS11", 0), ("CF_Lkas_LdwsSysState", "LKAS11", 0), ("CF_Lkas_SysWarning", "LKAS11", 0), ("CF_Lkas_LdwsLHWarning", "LKAS11", 0), diff --git a/selfdrive/car/hyundai/hyundaican.py b/selfdrive/car/hyundai/hyundaican.py index b5969d018b..1e7b751018 100644 --- a/selfdrive/car/hyundai/hyundaican.py +++ b/selfdrive/car/hyundai/hyundaican.py @@ -20,7 +20,7 @@ def create_lkas11(packer, frame, car_fingerprint, apply_steer, steer_req, values["CF_Lkas_Chksum"] = 0 if car_fingerprint in [CAR.SONATA, CAR.PALISADE]: - values["CF_Lkas_Bca_R"] = int(left_lane) + (int(right_lane) << 1) + values["CF_Lkas_LdwsActivemode"] = int(left_lane) + (int(right_lane) << 1) values["CF_Lkas_LdwsOpt_USM"] = 2 # FcwOpt_USM 5 = Orange blinking car + lanes @@ -40,9 +40,9 @@ def create_lkas11(packer, frame, car_fingerprint, apply_steer, steer_req, elif car_fingerprint == CAR.HYUNDAI_GENESIS: # This field is actually LdwsActivemode # Genesis and Optima fault when forwarding while engaged - values["CF_Lkas_Bca_R"] = 2 + values["CF_Lkas_LdwsActivemode"] = 2 elif car_fingerprint == CAR.KIA_OPTIMA: - values["CF_Lkas_Bca_R"] = 0 + values["CF_Lkas_LdwsActivemode"] = 0 dat = packer.make_can_msg("LKAS11", 0, values)[2]