Jason Wen 8945fffab0 Merge branch 'upstream/openpilot/master' into sync-20240220 ...

# Conflicts:
#	cereal
#	common/version.h
#	selfdrive/controls/controlsd.py
#	selfdrive/thermald/power_monitoring.py

2024-02-24 09:14:42 -05:00

..

assets

Merge remote-tracking branch 'commaai/openpilot/master' into sync-20240201

2024-02-05 11:41:19 -05:00

athena

athenad: check end_event while uploading files (#31541)

2024-02-22 00:31:24 -08:00

boardd

pandad: wait until USB is up before panda recovery (#31549)

2024-02-22 17:15:53 -08:00

car

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

2024-02-24 09:14:42 -05:00

controls

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

2024-02-24 09:14:42 -05:00

debug

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

2024-02-24 09:14:42 -05:00

locationd

torqued: log raw params if calculable (#31521)

2024-02-20 22:30:51 -08:00

manager

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

2024-02-20 11:05:51 -05:00

modeld

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

2024-02-20 11:05:51 -05:00

monitoring

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

2024-02-16 08:27:39 -05:00

navd

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

2024-02-16 08:27:39 -05:00

test

Split out can control into new "card" class (#31529)

2024-02-21 13:18:43 -08:00

thermald

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

2024-02-24 09:14:42 -05:00

ui

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

2024-02-24 09:14:42 -05:00

__init__.py

selfdrive/*.py

2020-01-17 11:03:42 -08:00

sentry.py

simplify git remote is comma check (#31284)

2024-02-02 21:23:32 -08:00

statsd.py

swaglog.py goes in common/ (#30631)

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

tombstoned.py

simplify git remote is comma check (#31284)

2024-02-02 21:23:32 -08:00

updated.py

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

2024-02-16 08:27:39 -05:00