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

# Conflicts:
#	.github/workflows/selfdrive_tests.yaml
#	common/params.h
#	common/params_keys.h
#	common/params_pyx.pyx
#	docs/CARS.md
#	opendbc_repo
#	panda
#	selfdrive/car/tests/test_models.py
#	selfdrive/pandad/pandad.cc
#	selfdrive/pandad/pandad.h
#	selfdrive/selfdrived/selfdrived.py
#	selfdrive/ui/translations/main_ar.ts
#	selfdrive/ui/translations/main_de.ts
#	selfdrive/ui/translations/main_es.ts
#	selfdrive/ui/translations/main_fr.ts
#	selfdrive/ui/translations/main_ja.ts
#	selfdrive/ui/translations/main_ko.ts
#	selfdrive/ui/translations/main_pt-BR.ts
#	selfdrive/ui/translations/main_th.ts
#	selfdrive/ui/translations/main_tr.ts
#	selfdrive/ui/translations/main_zh-CHS.ts
#	selfdrive/ui/translations/main_zh-CHT.ts
#	system/athena/athenad.py
#	system/athena/manage_athenad.py
#	system/manager/manager.py
#	system/sentry.py
#	uv.lock
Sync: `commaai/opendbc:master` into `sunnypilot/opendbc:master`

Sync: `commaai/panda:master` into `sunnypilot/panda:master`

selfdrive/debug/car/fw_versions.py

@@ -47,15 +47,15 @@ if __name__ == "__main__":
 
   num_pandas = len(messaging.recv_one_retry(pandaStates_sock).pandaStates)
 
-  t = time.time()
+  t = time.monotonic()
   print("Getting vin...")
   set_obd_multiplexing(True)
   vin_rx_addr, vin_rx_bus, vin = get_vin(*can_callbacks, (0, 1))
   print(f'RX: {hex(vin_rx_addr)}, BUS: {vin_rx_bus}, VIN: {vin}')
-  print(f"Getting VIN took {time.time() - t:.3f} s")
+  print(f"Getting VIN took {time.monotonic() - t:.3f} s")
   print()
 
-  t = time.time()
+  t = time.monotonic()
   fw_vers = get_fw_versions(*can_callbacks, set_obd_multiplexing, query_brand=args.brand, extra=extra, num_pandas=num_pandas, progress=True)
   _, candidates = match_fw_to_car(fw_vers, vin)
 
@@ -71,4 +71,4 @@ if __name__ == "__main__":
 
   print()
   print("Possible matches:", candidates)
-  print(f"Getting fw took {time.time() - t:.3f} s")
+  print(f"Getting fw took {time.monotonic() - t:.3f} s")

selfdrive/debug/car/vw_mqb_config.py

@@ -40,8 +40,7 @@ if __name__ == "__main__":
 
   panda = Panda()
   panda.set_safety_mode(CarParams.SafetyModel.elm327)
-  bus = 1 if panda.has_obd() else 0
-  uds_client = UdsClient(panda, MQB_EPS_CAN_ADDR, MQB_EPS_CAN_ADDR + RX_OFFSET, bus, timeout=0.2)
+  uds_client = UdsClient(panda, MQB_EPS_CAN_ADDR, MQB_EPS_CAN_ADDR + RX_OFFSET, 1, timeout=0.2)
 
   try:
     uds_client.diagnostic_session_control(SESSION_TYPE.EXTENDED_DIAGNOSTIC)

selfdrive/debug/cpu_usage_stat.py

@@ -37,8 +37,6 @@ monitored_proc_names = [
 
 cpu_time_names = ['user', 'system', 'children_user', 'children_system']
 
-timer = getattr(time, 'monotonic', time.time)
-
 
 def get_arg_parser():
   parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
@@ -72,7 +70,7 @@ if __name__ == "__main__":
       print('Add monitored proc:', k)
       stats[k] = {'cpu_samples': defaultdict(list), 'min': defaultdict(lambda: None), 'max': defaultdict(lambda: None),
                   'avg': defaultdict(float), 'last_cpu_times': None, 'last_sys_time': None}
-      stats[k]['last_sys_time'] = timer()
+      stats[k]['last_sys_time'] = time.monotonic()
       stats[k]['last_cpu_times'] = p.cpu_times()
       monitored_procs.append(p)
   i = 0
@@ -80,7 +78,7 @@ if __name__ == "__main__":
   while True:
     for p in monitored_procs:
       k = ' '.join(p.cmdline())
-      cur_sys_time = timer()
+      cur_sys_time = time.monotonic()
       cur_cpu_times = p.cpu_times()
       cpu_times = np.subtract(cur_cpu_times, stats[k]['last_cpu_times']) / (cur_sys_time - stats[k]['last_sys_time'])
       stats[k]['last_sys_time'] = cur_sys_time