Revert "FPv2: fingerprint on all FW combinations" #25417
Conversation
This reverts commit ee081f2.
|
Any reason this is a draft? |
This reverts commit bb68b7b.
selfdrive/car/fw_versions.py
Outdated
| fw_versions_dict[(addr, sub_addr)].add(fw.fwVersion) | ||
| return dict(fw_versions_dict) | ||
| fw_versions_dict[(addr, sub_addr)] = fw.fwVersion | ||
| return fw_versions_dict |
There was a problem hiding this comment.
We still want the reverted code here, as this will still be used for keeping around multiple responses from one ecu from different brand queries (some Hyundai ECUs respond differently to two different Hyundai queries for example).
| # Try to match using FW returned from this brand only | ||
| matches = match_fw_to_car_exact(build_fw_dict(car_fw)) |
There was a problem hiding this comment.
Goes from trying to match on all FW so far -> trying to match only on FW returned from this brand
| brands = get_interface_attr('FW_VERSIONS', ignore_none=True).keys() | ||
| for exact_match, match_func in exact_matches: | ||
| # TODO: For each brand, attempt to fingerprint using only FW returned from its queries | ||
| # For each brand, attempt to fingerprint using all FW returned from its queries | ||
| matches = set() | ||
| fw_versions_dict = build_fw_dict(fw_versions, filter_brand=None) | ||
| matches |= match_func(fw_versions_dict) | ||
| for brand in brands: | ||
| fw_versions_dict = build_fw_dict(fw_versions, filter_brand=brand) | ||
| matches |= match_func(fw_versions_dict) |
There was a problem hiding this comment.
This is responsible for going from matching using all FW, to filtering FW down to each brand's queries and fingerprinting solely on that.
|
There were some good improvements baked into that PR so I only reverted what we need to ensure we only fingerprint using a specific brand's returned versions. The main improvement this leaves in is making sure we try to fingerprint on all FW returned from the same ECU from multiple different brand queries (Hyundai is guilty of this). This may cause some cars to fail to fingerprint on master, but I think we need that to happen to gather data to know what to remove. |
Reverts the inter-brand fingerprinting part of #25204, but still keeps around fingerprinting on multiple FW versions for an ECU from the same brand.