Toyota: adaptive ACCEL_NET for new long tune (commaai#34034)

* bump * bump * fix that * should be a better way * raise
deanlee · Nov 16, 2024 · 863d86c · 863d86c
1 parent 55b94ab
commit 863d86c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/opendbc_repo b/opendbc_repo
diff --git 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: