Jason Wen a0d162ccd9 Merge branch 'master' into dev-priv/master ...

# Conflicts:
#	panda
#	selfdrive/car/nissan/carcontroller.py
#	selfdrive/car/subaru/subarucan.py
#	selfdrive/controls/controlsd.py
#	selfdrive/controls/lib/lateral_planner.py
#	selfdrive/ui/qt/offroad/settings.cc
#	selfdrive/ui/qt/onroad.cc
#	selfdrive/ui/ui.cc

2023-05-25 12:39:32 -04:00

..

lib

Merge branch 'master' into dev-priv/master

2023-05-25 12:39:32 -04:00

tests

boardd: ability to switch between ELM safety params (#27656)

2023-03-23 00:14:31 -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

Merge branch 'master' into dev-priv/master

2023-05-25 12:39:32 -04:00

plannerd.py

Merge branch 'master' into dev-priv/master

2023-03-24 15:24:05 -04:00

radard.py

Deprecate canMonoTimes (#26992)

2023-01-17 22:00:01 -08:00