Jason Wen 019257eb60 controlsd: Fix upstream conflicts

2024-02-12 21:16:48 -05:00

..

assets

Merge branch 'sync-20240201' into sync-priv-20240201

2024-02-07 22:49:01 -05:00

athena

test_athenad: create with_upload_handler decorator (#31250)

2024-01-31 18:44:04 -08:00

boardd

Use a safety param for gas interceptor (#30719)

2023-12-14 16:53:22 -08:00

car

FCR: sync with upstream supported car platforms

2024-02-12 21:05:49 -05:00

controls

controlsd: Fix upstream conflicts

2024-02-12 21:16:48 -05:00

debug

Merge branch 'sync-20240201' into sync-priv-20240201

2024-02-07 22:49:01 -05:00

locationd

Merge branch 'sync-20240201' into sync-priv-20240201

2024-02-07 22:49:01 -05:00

manager

Driving Model Selector: Handle default model loading

2024-02-12 21:05:49 -05:00

modeld

Driving Model Selector: Handle default model loading

2024-02-12 21:05:49 -05:00

monitoring

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

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

navd

Merge branch 'sync-20240201' into sync-priv-20240201

2024-02-07 22:49:01 -05:00

sunnypilot

Driving Model Selector: Can't import Params on PC

2024-02-12 16:00:32 -05:00

test

Merge branch 'sync-20240201' into sync-priv-20240201

2024-02-07 22:49:01 -05:00

thermald

Merge branch 'sync-20240201' into sync-priv-20240201

2024-02-07 22:49:01 -05:00

ui

Driving Model Selector: Handle default model loading

2024-02-12 21:05:49 -05:00

__init__.py

…

mapd_manager.py

Merge branch 'sync-20240201' into sync-priv-20240201

2024-02-07 22:49:01 -05:00

sentry.py

Merge branch 'sync-20240201' into sync-priv-20240201

2024-02-07 22:49:01 -05:00

statsd.py

swaglog.py goes in common/ (#30631)

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

tombstoned.py

swaglog.py goes in common/ (#30631)

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

updated.py

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

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