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

..

lib

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

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

tests

deprecate busTime (#33146)

2024-07-30 21:26:58 -07:00

__init__.py

selfdrive/controls

2020-01-17 12:48:30 -08:00

.gitignore

selfdrive/controls

2020-01-17 12:48:30 -08:00

controlsd.py

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

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

plannerd.py

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

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

radard.py

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

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