From 42c55f006a4a0596ff404c67db1a88eb64b45d9e Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 27 Sep 2023 22:08:57 -0700 Subject: [PATCH] Revert "remove fw exclusion" This reverts commit 0e3b47c5a30ebdb647caf5d792b10f517cbdf48f. --- selfdrive/car/toyota/values.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index 6250209625..6c28a4d907 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -280,8 +280,10 @@ def get_platform_codes(fw_versions: List[bytes]) -> Dict[bytes, Set[bytes]]: return dict(codes) -def match_fw_to_car_fuzzy(live_fw_versions) -> Set[str]: +def match_fw_to_car_fuzzy(live_fw_versions, exclude_fw: dict[int, bytes] = None) -> Set[str]: candidates = set() + if exclude_fw is None: + exclude_fw = dict() for candidate, fws in FW_VERSIONS.items(): # Keep track of ECUs which pass all checks (platform codes, within sub-version range) @@ -293,6 +295,10 @@ def match_fw_to_car_fuzzy(live_fw_versions) -> Set[str]: if ecu[0] not in PLATFORM_CODE_ECUS: continue + # ignore FW if in exclude dict and there's more than one fw + expected_versions = [fw for fw in expected_versions if addr not in exclude_fw or + (fw != exclude_fw[addr] or len(expected_versions) == 1)] + # Expected platform codes & versions expected_platform_codes = get_platform_codes(expected_versions)