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

juggle: use DBC dict generator (#34772)

Browse Source 
* juggle: support tesla DBC

* better

* fix

* sort
This commit is contained in:
Shane Smiskol
2025-03-04 15:54:43 -06:00
committed by GitHub
parent fe4585ee88
commit bc422a0738
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cabana/dbc/generate_dbc_json.py
+3 -3
View File
@@ -7,7 +7,7 @@ from opendbc.car.fingerprints import MIGRATION
from opendbc.car.values import PLATFORMS
def generate_dbc_json() -> str:
def generate_dbc_dict() -> dict[str, str]:
dbc_map = {}
for platform in PLATFORMS.values():
if platform != "MOCK":
@@ -24,7 +24,7 @@ def generate_dbc_json() -> str:
if MIGRATION[m] in dbc_map:
dbc_map[m] = dbc_map[MIGRATION[m]]
return json.dumps(dict(sorted(dbc_map.items())), indent=2)
return dbc_map
if __name__ == "__main__":
@@ -35,5 +35,5 @@ if __name__ == "__main__":
args = parser.parse_args()
with open(args.out, 'w') as f:
f.write(generate_dbc_json())
f.write(json.dumps(dict(sorted(generate_dbc_dict().items())), indent=2))
print(f"Generated and written to {args.out}")
tools/plotjuggler/juggle.py
+4 -4
View File
@@ -13,6 +13,7 @@ from functools import partial
from opendbc.car.fingerprints import MIGRATION
from openpilot.common.basedir import BASEDIR
from openpilot.common.swaglog import cloudlog
from openpilot.tools.cabana.dbc.generate_dbc_json import generate_dbc_dict
from openpilot.tools.lib.logreader import LogReader, ReadMode, save_log
from openpilot.selfdrive.test.process_replay.migration import migrate_all
@@ -90,11 +91,10 @@ def juggle_route(route_or_segment_name, can, layout, dbc, should_migrate):
if dbc is None:
try:
CP = lr.first('carParams')
platform = CP.carFingerprint
DBC = __import__(f"opendbc.car.{CP.brand}.values", fromlist=['DBC']).DBC
dbc = DBC[MIGRATION.get(CP.carFingerprint, CP.carFingerprint)]['pt']
platform = MIGRATION.get(CP.carFingerprint, CP.carFingerprint)
dbc = generate_dbc_dict()[platform]
except Exception:
cloudlog.error("Failed to get DBC name from logs!")
cloudlog.exception("Failed to get DBC name from logs!")
with tempfile.NamedTemporaryFile(suffix='.rlog', dir=juggle_dir) as tmp:
save_log(tmp.name, all_data, compress=False)