Jason Wen c8c4f2296d Merge branch 'master-priv' into custom-stock-long-planner-speed ...

# Conflicts:
#	common/params.cc
#	selfdrive/controls/controlsd.py
#	selfdrive/ui/qt/onroad/annotated_camera.cc

2024-05-16 01:40:56 -04:00

..

assets

LFS: Move to sunnypilot's public GitLab

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

athena

Refactor manage_athenad to make it more generic

2024-05-15 22:25:45 -04:00

boardd

boardd: add debug flag for injecting SPI errors (#32346)

2024-05-07 21:36:04 -07:00

car

Merge branch 'master-priv' into custom-stock-long-planner-speed

2024-05-16 01:40:56 -04:00

controls

Merge branch 'master-priv' into custom-stock-long-planner-speed

2024-05-16 01:40:56 -04:00

debug

Merge branch 'master' into SP-59-sync-priv-20240507

2024-05-15 16:04:19 -04:00

locationd

Merge branch 'master' into SP-59-sync-priv-20240507

2024-05-09 15:48:29 -04:00

manager

Merge branch 'master' into SP-59-sync-priv-20240507

2024-05-09 15:48:29 -04:00

modeld

Merge branch 'master' into SP-59-sync-priv-20240507

2024-05-15 16:04:19 -04:00

monitoring

Merge remote-tracking branch 'refs/remotes/openpilot/master' into small-sync

2024-05-09 15:13:00 +02:00

navd

Revert "[$100 bounty] mapsd: switch to static render mode (#32118)"

2024-05-15 22:25:53 -04:00

sunnypilot

Driving Model Selector: Can't import Params on PC

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

test

Merge branch 'master' into SP-59-sync-priv-20240507

2024-05-15 16:04:19 -04:00

thermald

Merge branch 'master' into SP-59-sync-priv-20240507

2024-05-09 15:48:29 -04:00

ui

Merge branch 'master-priv' into custom-stock-long-planner-speed

2024-05-16 01:40:56 -04:00

updated

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

2024-05-04 23:49:28 -04:00

__init__.py

…

mapd_manager.py

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

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

SConscript

scons: fix race condition with opendbc (#31621)

2024-02-28 11:41:42 -08:00

sentry.py

Merge branch 'master' into SP-59-sync-priv-20240507

2024-05-09 15:48:29 -04:00

statsd.py

use build_metadata everywhere we used to use get_version, get_commit, etc (#31941)

2024-03-21 10:15:29 -07:00

tombstoned.py

use build_metadata everywhere we used to use get_version, get_commit, etc (#31941)

2024-03-21 10:15:29 -07:00