Merge branch 'upstream/openpilot/master' into sync-20250423

This commit is contained in:
Jason Wen
2025-04-23 23:44:50 -04:00
5 changed files with 42 additions and 17 deletions
+4 -2
View File
@@ -61,13 +61,15 @@ def start_juggler(fn=None, dbc=None, layout=None, route_or_segment_name=None, pl
env["BASEDIR"] = BASEDIR
env["PATH"] = f"{INSTALL_DIR}:{os.getenv('PATH', '')}"
if dbc:
if os.path.exists(dbc):
dbc = os.path.abspath(dbc)
env["DBC_NAME"] = dbc
extra_args = ""
if fn is not None:
extra_args += f" -d {fn}"
extra_args += f" -d {os.path.abspath(fn)}"
if layout is not None:
extra_args += f" -l {layout}"
extra_args += f" -l {os.path.abspath(layout)}"
if route_or_segment_name is not None:
extra_args += f" --window_title \"{route_or_segment_name}{f' ({platform})' if platform is not None else ''}\""