From 863d86c10caafc60d99cc4b9e1267a688c7df2f9 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 15 Nov 2024 23:16:15 -0600 Subject: [PATCH] Toyota: adaptive ACCEL_NET for new long tune (#34034) * bump * bump * fix that * should be a better way * raise --- opendbc_repo | 2 +- tools/cabana/dbc/generate_dbc_json.py | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/opendbc_repo b/opendbc_repo index 40951c19e..661a42c91 160000 --- a/opendbc_repo +++ b/opendbc_repo @@ -1 +1 @@ -Subproject commit 40951c19ee2422a3a63eae878aedc9f0e1b255d4 +Subproject commit 661a42c91e28c370d90b3c4f0bf0f5a8cf015733 diff --git a/tools/cabana/dbc/generate_dbc_json.py b/tools/cabana/dbc/generate_dbc_json.py index 04d45f304..5e928e605 100755 --- a/tools/cabana/dbc/generate_dbc_json.py +++ b/tools/cabana/dbc/generate_dbc_json.py @@ -2,12 +2,23 @@ import argparse import json +from opendbc.car import Bus from opendbc.car.fingerprints import MIGRATION from opendbc.car.values import PLATFORMS def generate_dbc_json() -> str: - dbc_map = {platform.name: platform.config.dbc_dict['pt'] for platform in PLATFORMS.values() if platform != "MOCK"} + dbc_map = {} + for platform in PLATFORMS.values(): + if platform != "MOCK": + if Bus.pt in platform.config.dbc_dict: + dbc_map[platform.name] = platform.config.dbc_dict[Bus.pt] + elif Bus.main in platform.config.dbc_dict: + dbc_map[platform.name] = platform.config.dbc_dict[Bus.main] + elif Bus.party in platform.config.dbc_dict: + dbc_map[platform.name] = platform.config.dbc_dict[Bus.party] + else: + raise ValueError("Unknown main type") for m in MIGRATION: if MIGRATION[m] in dbc_map: