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

cabana: migrate dbc map (#31920)

Browse Source 
* fix cabana

* within platform map
old-commit-hash: 1f424bf7dcbe13a6a60212816cfd3057da6f5a1f
This commit is contained in:
Justin Newberry
2024-03-20 13:57:41 -04:00
committed by GitHub
parent aa56650862
commit bce4276d06
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/car/fingerprints.py
+14
View File
@@ -1,3 +1,4 @@
from typing import Any, Callable
from openpilot.selfdrive.car.interfaces import get_interface_attr
from openpilot.selfdrive.car.body.values import CAR as BODY
from openpilot.selfdrive.car.chrysler.values import CAR as CHRYSLER
@@ -10,6 +11,7 @@ from openpilot.selfdrive.car.nissan.values import CAR as NISSAN
from openpilot.selfdrive.car.subaru.values import CAR as SUBARU
from openpilot.selfdrive.car.tesla.values import CAR as TESLA
from openpilot.selfdrive.car.toyota.values import CAR as TOYOTA
from openpilot.selfdrive.car.values import PLATFORMS, Platform
from openpilot.selfdrive.car.volkswagen.values import CAR as VW
FW_VERSIONS = get_interface_attr('FW_VERSIONS', combine_brands=True, ignore_none=True)
@@ -336,3 +338,15 @@ MIGRATION = {
"SKODA SCALA 1ST GEN": VW.SKODA_SCALA_MK1,
"SKODA SUPERB 3RD GEN": VW.SKODA_SUPERB_MK3,
}
MapFunc = Callable[[Platform], Any]
def create_platform_map(func: MapFunc):
ret = {str(platform): func(platform) for platform in PLATFORMS.values() if func(platform) is not None}
for m in MIGRATION:
ret[m] = ret[MIGRATION[m]]
return ret
selfdrive/car/values.py
+1 -7
View File
@@ -1,4 +1,4 @@
from typing import Any, Callable, cast
from typing import cast
from openpilot.selfdrive.car.body.values import CAR as BODY
from openpilot.selfdrive.car.chrysler.values import CAR as CHRYSLER
from openpilot.selfdrive.car.ford.values import CAR as FORD
@@ -17,9 +17,3 @@ Platform = BODY | CHRYSLER | FORD | GM | HONDA | HYUNDAI | MAZDA | MOCK | NISSAN
BRANDS = [BODY, CHRYSLER, FORD, GM, HONDA, HYUNDAI, MAZDA, MOCK, NISSAN, SUBARU, TESLA, TOYOTA, VOLKSWAGEN]
PLATFORMS: dict[str, Platform] = {str(platform): platform for brand in BRANDS for platform in cast(list[Platform], brand)}
MapFunc = Callable[[Platform], Any]
def create_platform_map(func: MapFunc):
return {str(platform): func(platform) for platform in PLATFORMS.values() if func(platform) is not None}
tools/cabana/dbc/generate_dbc_json.py
+1 -1
View File
@@ -2,7 +2,7 @@
import argparse
import json
from openpilot.selfdrive.car.values import create_platform_map
from openpilot.selfdrive.car.fingerprints import create_platform_map
def generate_dbc_json() -> str: