Jason Wen d2dbbd4e69 Merge branch 'master-priv' into master-dev-c3 ...

# Conflicts:
#	CHANGELOGS.md
#	selfdrive/controls/lib/desire_helper.py
#	selfdrive/ui/qt/widgets/controls.h

2024-05-29 22:44:32 -04:00

..

assets

LFS: Move to sunnypilot's public GitLab

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

athena

Change logging level from info to debug in athenad.py and sunnylinkd.py

2024-05-28 15:08:40 +02:00

boardd

ui: Force offroad from settings when the car is on

2024-05-17 06:00:29 +00:00

car

Merge branch 'SP-134-pause-lateral-speed' into master-dev-c3

2024-05-29 08:10:10 -04:00

controls

Auto Lane Change: Add option to disable lane change

2024-05-30 02:42:11 +00: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 'refs/heads/routes-to-s3' into master-dev-c3

2024-05-29 18:23:26 +02:00

modeld

Driving Model Selector: Introduce ModelCapabilities class for model feature handling

2024-05-23 21:39:28 +00: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

ui: Force offroad from settings when the car is on

2024-05-17 06:00:29 +00:00

ui

Merge branch 'master-priv' into master-dev-c3

2024-05-29 22:44:32 -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

Sentry: Add sunnylink_dongle_id tag

2024-05-18 03:59:26 +00: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