diff --git a/selfdrive/car/honda/fingerprints.py b/selfdrive/car/honda/fingerprints.py index d24838ffbc..863b9d441b 100644 --- a/selfdrive/car/honda/fingerprints.py +++ b/selfdrive/car/honda/fingerprints.py @@ -160,7 +160,7 @@ FW_VERSIONS = { b'36802-TVA-A330\x00\x00', b'36802-TVC-A330\x00\x00', b'36802-TVE-H070\x00\x00', - b'36802-TWA-A070\x00\x00', + b'36802-TWA-A079\x00\x00', b'36802-TWA-A080\x00\x00', ], (Ecu.fwdCamera, 0x18dab5f1, None): [ @@ -169,7 +169,7 @@ FW_VERSIONS = { b'36161-TVA-A330\x00\x00', b'36161-TVC-A330\x00\x00', b'36161-TVE-H050\x00\x00', - b'36161-TWA-A070\x00\x00', + b'36161-TWA-A010\x00\x00', ], (Ecu.gateway, 0x18daeff1, None): [ b'38897-TVA-A010\x00\x00', diff --git a/selfdrive/car/tests/test_fw_fingerprint.py b/selfdrive/car/tests/test_fw_fingerprint.py index 17eba80d2a..830bf5f323 100755 --- a/selfdrive/car/tests/test_fw_fingerprint.py +++ b/selfdrive/car/tests/test_fw_fingerprint.py @@ -35,16 +35,28 @@ class TestFwFingerprint(unittest.TestCase): @parameterized.expand([(b, c, e[c]) for b, e in VERSIONS.items() for c in e]) def test_exact_match(self, brand, car_model, ecus): + print() + print(brand, car_model) + config = FW_QUERY_CONFIGS[brand] CP = car.CarParams.new_message() for _ in range(200): fw = [] for ecu, fw_versions in ecus.items(): + print(ecu) + # if car_model in config.non_essential_ecus.get(ecu[0], []): + if ecu[0] in config.non_essential_ecus: + print('continue') + continue ecu_name, addr, sub_addr = ecu fw.append({"ecu": ecu_name, "fwVersion": random.choice(fw_versions), 'brand': brand, "address": addr, "subAddress": 0 if sub_addr is None else sub_addr}) CP.carFw = fw + print(CP.carFw) _, matches = match_fw_to_car(CP.carFw, allow_fuzzy=False) - self.assertFingerprints(matches, car_model) + assert len(matches) < 2 + if len(matches) == 1: + self.assertFingerprints(matches, car_model) + # self.assertFingerprints(matches, car_model) @parameterized.expand([(b, c, e[c]) for b, e in VERSIONS.items() for c in e]) def test_custom_fuzzy_match(self, brand, car_model, ecus):