Jason Wen 211ff21af0 Merge branch 'master' into SP-147-sync-priv-2024 ...

# Conflicts:
#	common/api/__init__.py
#	panda
#	release/build_release.sh
#	release/files_common
#	selfdrive/car/card.py
#	selfdrive/car/toyota/carcontroller.py
#	selfdrive/controls/controlsd.py
#	selfdrive/controls/radard.py
#	selfdrive/ui/qt/api.cc
#	selfdrive/ui/qt/maps/map.cc
#	selfdrive/ui/ui.cc
#	system/athena/manage_athenad.py
#	system/athena/manage_sunnylinkd.py
#	system/athena/sunnylinkd.py
#	system/manager/gitlab_runner.sh
#	system/manager/manager.py
#	system/manager/mapd_installer.py
#	system/manager/process_config.py
#	system/manager/sunnylink.py
#	system/sentry.py

2024-06-12 14:28:20 -04:00

..

athena

Merge branch 'master' into SP-147-sync-priv-2024

2024-06-12 14:28:20 -04:00

camerad

manager: move to system/ (#32538)

2024-05-25 12:41:17 -07:00

fleetmanager

LFS: Move to sunnypilot's public GitLab

2024-05-01 22:12:26 -04:00

hardware

Merge branch 'master' into SP-147-sync-priv-2024

2024-06-12 14:28:20 -04:00

logcatd

Revert "Switch from json11 to nlohmann/json (#31093)"

2024-01-22 22:41:59 -08:00

loggerd

Merge branch 'master' into SP-147-sync-priv-2024

2024-06-12 14:28:20 -04:00

manager

Merge branch 'master' into SP-147-sync-priv-2024

2024-06-12 14:28:20 -04:00

proclogd

Revert "Switch from json11 to nlohmann/json (#31093)"

2024-01-22 22:41:59 -08:00

qcomgpsd

manager: move to system/ (#32538)

2024-05-25 12:41:17 -07:00

sensord

manager: move to system/ (#32538)

2024-05-25 12:41:17 -07:00

tests

manager: move to system/ (#32538)

2024-05-25 12:41:17 -07:00

thermald

Merge branch 'master' into SP-147-sync-priv-2024

2024-06-12 14:28:20 -04:00

ubloxd

manager: move to system/ (#32538)

2024-05-25 12:41:17 -07:00

updated

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

2024-06-08 23:08:33 -04:00

webrtc

ruff: enable TRY

2024-05-20 17:47:48 -07:00

__init__.py

Move selfdrive/hardware/ to system/ (#24725)

2022-06-11 16:38:24 -07:00

logmessaged.py

swaglog.py goes in common/ (#30631)

2023-12-06 17:27:51 -08:00

mapd_manager.py

Merge branch 'master' into SP-147-sync-priv-2024

2024-06-12 14:28:20 -04:00

micd.py

soundd/micd: retry getting stream (#30701)

2023-12-12 15:58:24 -08:00

sentry.py

Merge branch 'master' into SP-147-sync-priv-2024

2024-06-12 14:28:20 -04:00

statsd.py

move sentry/stats to system/ (#32490)

2024-05-20 22:39:25 -07:00

timed.py

timed: set valid flag (#32061)

2024-03-30 17:47:21 -07:00

tombstoned.py

move sentry/stats to system/ (#32490)

2024-05-20 22:39:25 -07:00

ugpsd.py

unicore gps (#31852)

2024-03-12 22:33:45 -07:00

version.py

Merge branch 'master' into SP-147-sync-priv-2024

2024-06-12 14:28:20 -04:00