From b6897bce1a06d1d8b3e5fb11d2476c5ac7ba3e87 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 24 Mar 2023 00:29:48 -0700 Subject: [PATCH] FPv2: only set multiplexing when needed (#27669) * only set multiplexing if bus matters * these don't matter anymore old-commit-hash: 9e023b3eadcf4d8ed0b59fd5fbe4041342be322f --- selfdrive/car/fw_versions.py | 3 ++- selfdrive/car/hyundai/values.py | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/selfdrive/car/fw_versions.py b/selfdrive/car/fw_versions.py index e71d161f7f..9bb04ee821 100755 --- a/selfdrive/car/fw_versions.py +++ b/selfdrive/car/fw_versions.py @@ -280,7 +280,8 @@ def get_fw_versions(logcan, sendcan, query_brand=None, extra=None, timeout=0.1, continue # Toggle OBD multiplexing for each request - set_obd_multiplexing(params, r.obd_multiplexing) + if r.bus % 4 == 1: + set_obd_multiplexing(params, r.obd_multiplexing) try: addrs = [(a, s) for (b, a, s) in addr_chunk if b in (brand, 'any') and diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index 57d306496b..bb26d68329 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -369,7 +369,6 @@ FW_QUERY_CONFIG = FwQueryConfig( whitelist_ecus=[Ecu.fwdCamera, Ecu.fwdRadar, Ecu.cornerRadar, Ecu.hvac], bus=0, auxiliary=True, - obd_multiplexing=False, ), Request( [HYUNDAI_VERSION_REQUEST_LONG], @@ -387,7 +386,6 @@ FW_QUERY_CONFIG = FwQueryConfig( whitelist_ecus=[Ecu.parking], bus=0, auxiliary=True, - obd_multiplexing=False, ), Request( [HYUNDAI_VERSION_REQUEST_ALT],