Jason Wen 4d8c13ba42 Merge branch 'upstream/openpilot/master' into sync-20240224 ...

# Conflicts:
#	cereal
#	common/params.cc
#	selfdrive/car/chrysler/interface.py

2024-02-27 21:01:40 -05:00

..

assets

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

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

athena

move with_http_server to selfdrive/test/helpers (#31597)

2024-02-26 12:53:17 -08:00

boardd

use pyupgrade to update to new typing syntax (#31580)

2024-02-24 16:41:23 -08:00

car

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

2024-02-27 21:01:40 -05:00

controls

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

2024-02-26 16:39:04 -05:00

debug

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

2024-02-24 20:46:45 -05:00

locationd

Wheeled body (#31614)

2024-02-27 13:23:04 -08:00

manager

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

2024-02-26 16:39:04 -05:00

modeld

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

2024-02-24 20:46:45 -05:00

monitoring

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

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

navd

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

2024-02-26 16:39:04 -05:00

test

tici tests: remove pytest.main (#31622)

2024-02-27 14:06:18 -08:00

thermald

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

2024-02-24 20:46:45 -05:00

ui

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

2024-02-26 16:39:04 -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

use pyupgrade to update to new typing syntax (#31580)

2024-02-24 16:41:23 -08:00

tombstoned.py

simplify git remote is comma check (#31284)

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

updated.py

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

2024-02-26 16:39:04 -05:00