Merge branch 'openpilot/master' into sync-20250108

# Conflicts:
#	common/base.py
#	common/comma_connect.py
#	opendbc_repo
#	panda
This commit is contained in:
Jason Wen
2025-01-08 23:40:36 -05:00
160 changed files with 854 additions and 9384 deletions
+3 -2
View File
@@ -67,7 +67,8 @@ def manager_init() -> None:
except PermissionError:
print(f"WARNING: failed to make {Paths.shm_path()}")
# set version params
# set params
serial = HARDWARE.get_serial()
params.put("Version", build_metadata.openpilot.version)
params.put("TermsVersion", terms_version)
params.put("TrainingVersion", training_version)
@@ -77,13 +78,13 @@ def manager_init() -> None:
params.put("GitRemote", build_metadata.openpilot.git_origin)
params.put_bool("IsTestedBranch", build_metadata.tested_channel)
params.put_bool("IsReleaseBranch", build_metadata.release_channel)
params.put("HardwareSerial", serial)
# set dongle id
reg_res = register(show_spinner=True)
if reg_res:
dongle_id = reg_res
else:
serial = params.get("HardwareSerial")
raise Exception(f"Registration failed for device {serial}")
os.environ['DONGLE_ID'] = dongle_id # Needed for swaglog
os.environ['GIT_ORIGIN'] = build_metadata.openpilot.git_normalized_origin # Needed for swaglog