Jason Wen cf867c8e24 Merge branch 'hkg-can-jerk' into master-dev-c3 ...

# Conflicts:
#	selfdrive/controls/lib/longcontrol.py
#	selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.cc

2024-08-04 11:03:19 -04:00

..

assets

Revert "remove navigation (#32773)"

2024-07-06 22:44:27 -04:00

car

Merge branch 'hkg-can-jerk' into master-dev-c3

2024-08-04 11:03:19 -04:00

controls

Merge branch 'hkg-can-jerk' into master-dev-c3

2024-08-04 11:03:19 -04:00

debug

Sync: commaai/msgq:master into sunnypilot/msgq:master

2024-08-03 21:22:09 -04:00

locationd

Sync: commaai/msgq:master into sunnypilot/msgq:master

2024-08-03 21:22:09 -04:00

modeld

Sync: commaai/msgq:master into sunnypilot/msgq:master

2024-08-03 21:22:09 -04:00

monitoring

Sync: commaai/opendbc:master into sunnypilot/opendbc:master

2024-06-12 21:09:05 -04:00

navd

ui: Split sunnypilot into its own classes

2024-07-29 06:40:35 -04:00

pandad

Sync: commaai/msgq:master into sunnypilot/msgq:master

2024-08-03 21:22:09 -04:00

sunnypilot

Driving Model Selector v5

2024-07-07 17:53:26 -04:00

test

Sync: commaai/msgq:master into sunnypilot/msgq:master

2024-08-03 21:22:09 -04:00

ui

Merge branch 'master' into hkg-can-jerk

2024-08-04 09:08:04 -04:00

__init__.py

…

SConscript

Revert "remove navigation (#32773)"

2024-07-06 22:44:27 -04:00