Jason Wen b94543ea25 Merge branch 'master' into hkg-can-jerk ...

# Conflicts:
#	.gitlab-ci.yml
#	SConstruct
#	selfdrive/car/chrysler/interface.py
#	selfdrive/car/ford/interface.py
#	selfdrive/car/gm/interface.py
#	selfdrive/car/honda/interface.py
#	selfdrive/car/hyundai/carcontroller.py
#	selfdrive/car/hyundai/hyundaicanfd.py
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/interfaces.py
#	selfdrive/car/mazda/interface.py
#	selfdrive/car/subaru/interface.py
#	selfdrive/car/volkswagen/interface.py
#	selfdrive/ui/SConscript
#	selfdrive/ui/qt/onroad/annotated_camera.cc
#	selfdrive/ui/sunnypilot/SConscript
#	selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.cc
#	selfdrive/ui/sunnypilot/qt/offroad/settings/visuals_settings.cc
#	system/manager/process_config.py

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

..

installer

ui/installer: hardcode SSH Keys in installer.cc (#32838)

2024-06-26 11:52:11 -07:00

qt

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

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

sunnypilot

Merge branch 'master' into hkg-can-jerk

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

tests

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

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

translations

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

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

__init__.py

Soundd: move to python (#30567)

2023-12-05 18:10:01 -08:00

.gitignore

fix spinner asset paths (#31524)

2024-02-20 18:01:28 -08:00

main.cc

ui: Split sunnypilot into its own classes

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

mui.cc

bring this back

2024-02-09 12:46:06 -08:00

SConscript

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

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

soundd.py

Merge branch 'master' into sync-priv-20240227

2024-02-27 21:22:16 -05:00

spinner

fix spinner asset paths (#31524)

2024-02-20 18:01:28 -08:00

text

fix spinner asset paths (#31524)

2024-02-20 18:01:28 -08:00

ui.cc

ui: Split sunnypilot into its own classes

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

ui.h

ui: Split sunnypilot into its own classes

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

ui.py

fix status -> state typo

2024-03-09 23:31:50 -08:00

update_translations.py

ensure alerts_generated.h is built (#33157)

2024-07-31 16:12:37 -07:00

watch3.cc

Revert "remove navigation (#32773)"

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