mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-07-06 05:52:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

format fingerprints: simplify sorting (#30826)

Browse Source 
* unique + sort + don't modify FW_VERSIONS

* clean up

* not here

* self expl
old-commit-hash: b38c580c2e687401fc819520ea038653873e9996
This commit is contained in:
Shane Smiskol
2023-12-20 15:51:56 -08:00
committed by GitHub
parent ceec7907cc
commit 83ee5fa80d
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/debug/format_fingerprints.py
+4 -14
View File
@@ -52,7 +52,7 @@ FW_VERSIONS = {
{% for key, fw_versions in FW_VERSIONS[brand][car].items() %}
(Ecu.{{ECU_NAME[key[0]]}}, 0x{{"%0x" | format(key[1] | int)}}, \
{% if key[2] %}0x{{"%0x" | format(key[2] | int)}}{% else %}{{key[2]}}{% endif %}): [
{% for fw_version in fw_versions %}
{% for fw_version in (fw_versions + extra_fw_versions.get(car, {}).get(key, [])) | unique | sort %}
{{fw_version}},
{% endfor %}
],
@@ -65,26 +65,16 @@ FW_VERSIONS = {
def format_brand_fw_versions(brand, extra_fw_versions: None | dict[str, dict[tuple, list[bytes]]] = None):
fw_versions = FW_VERSIONS.copy()
# TODO: this modifies FW_VERSIONS in place
if extra_fw_versions is not None:
for platform, ecus in extra_fw_versions.items():
for ecu, fws in ecus.items():
fw_versions[brand][platform][ecu] += set(fws) - set(fw_versions[brand][platform][ecu])
extra_fw_versions = extra_fw_versions or {}
fingerprints_file = os.path.join(BASEDIR, f"selfdrive/car/{brand}/fingerprints.py")
with open(fingerprints_file, "r") as f:
comments = [line for line in f.readlines() if line.startswith("#") and "noqa" not in line]
# sort fw versions
if fw_versions[brand] is not None:
for platform in fw_versions[brand]:
for ecu in fw_versions[brand][platform]:
fw_versions[brand][platform][ecu] = sorted(fw_versions[brand][platform][ecu])
with open(fingerprints_file, "w") as f:
f.write(FINGERPRINTS_PY_TEMPLATE.render(brand=brand, comments=comments, ECU_NAME=ECU_NAME,
FINGERPRINTS=FINGERPRINTS, FW_VERSIONS=fw_versions))
FINGERPRINTS=FINGERPRINTS, FW_VERSIONS=FW_VERSIONS,
extra_fw_versions=extra_fw_versions))
if __name__ == "__main__":