Jason Wen
53327edb50
Merge branch 'upstream/openpilot/master' into sync-20260111
...
# Conflicts:
# common/api.py
# docs/CARS.md
# opendbc_repo
# panda
# scripts/lint/lint.sh
# selfdrive/car/car_specific.py
# selfdrive/car/card.py
# selfdrive/test/process_replay/ref_commit
# system/hardware/hardwared.py
# tinygrad_repo
2026-01-20 07:29:25 -05:00
Jason Wen
03c8494dbc
Merge branch 'upstream/openpilot/master' into sync-20251213
...
# Conflicts:
# README.md
# common/api.py
# docs/CARS.md
# opendbc_repo
# panda
# selfdrive/ui/mici/layouts/offroad_alerts.py
# system/ui/README.md
# system/version.py
2025-12-13 01:50:42 -05:00
Jason Wen
08e85808c5
Merge branch 'upstream/openpilot/master' into sync-20251114
...
# Conflicts:
# .github/workflows/ci_weekly_run.yaml
# .github/workflows/raylib_ui_preview.yaml
# .github/workflows/tests.yaml
# .gitmodules
# README.md
# SConstruct
# common/api.py
# common/params_keys.h
# docs/CARS.md
# msgq_repo
# opendbc_repo
# panda
# selfdrive/car/tests/test_car_interfaces.py
# selfdrive/controls/controlsd.py
# selfdrive/controls/lib/latcontrol.py
# selfdrive/controls/lib/latcontrol_angle.py
# selfdrive/controls/lib/latcontrol_pid.py
# selfdrive/controls/lib/latcontrol_torque.py
# selfdrive/controls/tests/test_latcontrol.py
# selfdrive/monitoring/helpers.py
# selfdrive/ui/SConscript
# selfdrive/ui/main.cc
# selfdrive/ui/qt/body.h
# selfdrive/ui/qt/home.cc
# selfdrive/ui/qt/home.h
# selfdrive/ui/qt/network/networking.cc
# selfdrive/ui/qt/network/networking.h
# selfdrive/ui/qt/network/wifi_manager.cc
# selfdrive/ui/qt/offroad/developer_panel.cc
# selfdrive/ui/qt/offroad/developer_panel.h
# selfdrive/ui/qt/offroad/experimental_mode.cc
# selfdrive/ui/qt/offroad/firehose.cc
# selfdrive/ui/qt/offroad/firehose.h
# selfdrive/ui/qt/offroad/onboarding.cc
# selfdrive/ui/qt/offroad/onboarding.h
# selfdrive/ui/qt/offroad/settings.cc
# selfdrive/ui/qt/offroad/settings.h
# selfdrive/ui/qt/offroad/software_settings.cc
# selfdrive/ui/qt/onroad/alerts.cc
# selfdrive/ui/qt/onroad/annotated_camera.h
# selfdrive/ui/qt/onroad/buttons.cc
# selfdrive/ui/qt/onroad/buttons.h
# selfdrive/ui/qt/onroad/driver_monitoring.cc
# selfdrive/ui/qt/onroad/hud.cc
# selfdrive/ui/qt/onroad/hud.h
# selfdrive/ui/qt/onroad/model.cc
# selfdrive/ui/qt/onroad/model.h
# selfdrive/ui/qt/onroad/onroad_home.cc
# selfdrive/ui/qt/onroad/onroad_home.h
# selfdrive/ui/qt/request_repeater.h
# selfdrive/ui/qt/sidebar.cc
# selfdrive/ui/qt/sidebar.h
# selfdrive/ui/qt/util.cc
# selfdrive/ui/qt/widgets/cameraview.h
# selfdrive/ui/qt/widgets/controls.cc
# selfdrive/ui/qt/widgets/controls.h
# selfdrive/ui/qt/widgets/input.cc
# selfdrive/ui/qt/widgets/input.h
# selfdrive/ui/qt/widgets/prime.cc
# selfdrive/ui/qt/widgets/prime.h
# selfdrive/ui/qt/widgets/ssh_keys.h
# selfdrive/ui/qt/widgets/toggle.h
# selfdrive/ui/qt/widgets/wifi.cc
# selfdrive/ui/qt/widgets/wifi.h
# selfdrive/ui/qt/window.cc
# selfdrive/ui/qt/window.h
# selfdrive/ui/tests/cycle_offroad_alerts.py
# selfdrive/ui/tests/test_ui/run.py
# selfdrive/ui/translations/main_ar.ts
# selfdrive/ui/translations/main_de.ts
# selfdrive/ui/translations/main_es.ts
# selfdrive/ui/translations/main_fr.ts
# selfdrive/ui/translations/main_ja.ts
# selfdrive/ui/translations/main_ko.ts
# selfdrive/ui/translations/main_nl.ts
# selfdrive/ui/translations/main_pl.ts
# selfdrive/ui/translations/main_pt-BR.ts
# selfdrive/ui/translations/main_th.ts
# selfdrive/ui/translations/main_tr.ts
# selfdrive/ui/translations/main_zh-CHS.ts
# selfdrive/ui/translations/main_zh-CHT.ts
# selfdrive/ui/ui.cc
# selfdrive/ui/ui.h
# system/manager/build.py
# system/version.py
2025-11-16 02:50:28 -05:00
Jason Wen
ec8f036850
Merge branch 'upstream/openpilot/master' into sync-20250908
...
# Conflicts:
# .github/workflows/selfdrive_tests.yaml
# README.md
# docs/CARS.md
# opendbc_repo
# panda
# selfdrive/car/tests/test_car_interfaces.py
# selfdrive/modeld/modeld.py
# selfdrive/selfdrived/selfdrived.py
# selfdrive/ui/translations/main_ar.ts
# selfdrive/ui/translations/main_de.ts
# selfdrive/ui/translations/main_es.ts
# selfdrive/ui/translations/main_fr.ts
# selfdrive/ui/translations/main_ja.ts
# selfdrive/ui/translations/main_ko.ts
# selfdrive/ui/translations/main_pt-BR.ts
# selfdrive/ui/translations/main_th.ts
# selfdrive/ui/translations/main_tr.ts
# selfdrive/ui/translations/main_zh-CHS.ts
# selfdrive/ui/translations/main_zh-CHT.ts
# system/hardware/hardwared.py
# system/updated/updated.py
# tinygrad_repo
# uv.lock
2025-09-13 15:23:36 -04:00
Jason Wen
798e9071d8
Merge branch 'upstream/openpilot/master' into sync-20250823
...
# Conflicts:
# .github/workflows/release.yaml
# README.md
# RELEASES.md
# common/params_keys.h
# docs/CARS.md
# opendbc_repo
# panda
# release/build_stripped.sh
# selfdrive/controls/lib/longitudinal_planner.py
# selfdrive/modeld/modeld.py
# selfdrive/ui/feedback/feedbackd.py
# selfdrive/ui/translations/main_ar.ts
# selfdrive/ui/translations/main_de.ts
# selfdrive/ui/translations/main_es.ts
# selfdrive/ui/translations/main_fr.ts
# selfdrive/ui/translations/main_ja.ts
# selfdrive/ui/translations/main_ko.ts
# selfdrive/ui/translations/main_pt-BR.ts
# selfdrive/ui/translations/main_th.ts
# selfdrive/ui/translations/main_tr.ts
# selfdrive/ui/translations/main_zh-CHS.ts
# selfdrive/ui/translations/main_zh-CHT.ts
# system/version.py
# uv.lock
2025-08-24 14:52:21 -04:00
Jason Wen
6c4c0c00b4
Merge branch 'upstream/openpilot/master' into sync-20250812
...
# Conflicts:
# opendbc_repo
# selfdrive/controls/controlsd.py
# selfdrive/controls/lib/latcontrol_angle.py
# selfdrive/controls/lib/latcontrol_pid.py
# selfdrive/controls/lib/latcontrol_torque.py
2025-08-12 23:11:18 -04:00
Jason Wen
d6474aa0a9
Merge branch 'upstream/openpilot/master' into sync-20250731
...
# Conflicts:
# .github/workflows/selfdrive_tests.yaml
# common/params.h
# common/params_keys.h
# common/params_pyx.pyx
# docs/CARS.md
# opendbc_repo
# panda
# selfdrive/car/tests/test_models.py
# selfdrive/pandad/pandad.cc
# selfdrive/pandad/pandad.h
# selfdrive/selfdrived/selfdrived.py
# selfdrive/ui/translations/main_ar.ts
# selfdrive/ui/translations/main_de.ts
# selfdrive/ui/translations/main_es.ts
# selfdrive/ui/translations/main_fr.ts
# selfdrive/ui/translations/main_ja.ts
# selfdrive/ui/translations/main_ko.ts
# selfdrive/ui/translations/main_pt-BR.ts
# selfdrive/ui/translations/main_th.ts
# selfdrive/ui/translations/main_tr.ts
# selfdrive/ui/translations/main_zh-CHS.ts
# selfdrive/ui/translations/main_zh-CHT.ts
# system/athena/athenad.py
# system/athena/manage_athenad.py
# system/manager/manager.py
# system/sentry.py
# uv.lock
Sync: `commaai/opendbc:master` into `sunnypilot/opendbc:master`
Sync: `commaai/panda:master` into `sunnypilot/panda:master`
2025-08-02 00:21:14 -04:00
Jason Wen
beaec753ab
Merge branch 'upstream/openpilot/master' into sync-20250710
...
# Conflicts:
# .github/workflows/selfdrive_tests.yaml
# README.md
# common/params_keys.h
# opendbc_repo
# panda
# selfdrive/controls/lib/longitudinal_planner.py
# selfdrive/controls/lib/tests/test_latcontrol.py
# selfdrive/ui/soundd.py
# selfdrive/ui/translations/main_ar.ts
# selfdrive/ui/translations/main_de.ts
# selfdrive/ui/translations/main_es.ts
# selfdrive/ui/translations/main_fr.ts
# selfdrive/ui/translations/main_ja.ts
# selfdrive/ui/translations/main_ko.ts
# selfdrive/ui/translations/main_pt-BR.ts
# selfdrive/ui/translations/main_th.ts
# selfdrive/ui/translations/main_tr.ts
# selfdrive/ui/translations/main_zh-CHS.ts
# selfdrive/ui/translations/main_zh-CHT.ts
# tinygrad_repo
2025-07-19 00:28:43 -04:00
DevTekVE
ea8eaed1aa
Merge remote-tracking branch 'comma/master' into sync-20250627
...
# Conflicts:
# README.md
# opendbc_repo
# panda
# selfdrive/ui/qt/offroad/settings.cc
# selfdrive/ui/translations/main_ar.ts
# selfdrive/ui/translations/main_de.ts
# selfdrive/ui/translations/main_es.ts
# selfdrive/ui/translations/main_fr.ts
# selfdrive/ui/translations/main_ja.ts
# selfdrive/ui/translations/main_ko.ts
# selfdrive/ui/translations/main_pt-BR.ts
# selfdrive/ui/translations/main_th.ts
# selfdrive/ui/translations/main_tr.ts
# selfdrive/ui/translations/main_zh-CHS.ts
# selfdrive/ui/translations/main_zh-CHT.ts
# system/manager/build.py
# system/ui/spinner.py
# tinygrad_repo
# tools/lib/framereader.py
Merge branch 'comma-202506127-bedcb896644528aed6af448e63eeadb3dd8b2c77' into sync-20250627
# Conflicts:
# opendbc/safety/tests/libsafety/SConscript
Merge branch 'comma-202506127-bedcb896644528aed6af448e63eeadb3dd8b2c77' into sync-20250627
# Conflicts:
# opendbc/safety/tests/libsafety/SConscript
Merge remote-tracking branch 'comma/master' into sync-20250627
# Conflicts:
# opendbc/safety/tests/libsafety/SConscript
Merge branch 'comma-20250627-1020d355584265391eb3acb556e4353b581fa9c0' into sync-20250627
Merge branch 'comma-20250627-1020d355584265391eb3acb556e4353b581fa9c0' into sync-20250627
Sync: `commaai/opendbc:master` into `sunnypilot/opendbc:master-new`
Sync: `commaai/opendbc:master` into `sunnypilot/opendbc:master-new`
Sync: `commaai/panda:master` into `sunnypilot/panda:master-new`
Sync: `commaai/panda:master` into `sunnypilot/panda:master-new`
2025-06-28 21:43:38 +02:00
DevTekVE
82487ba136
Merge remote-tracking branch 'comma/master' into sync-20250531
...
# Conflicts:
# .github/workflows/selfdrive_tests.yaml
# common/params_keys.h
# msgq_repo
# opendbc_repo
# panda
# selfdrive/car/card.py
# selfdrive/car/tests/test_car_interfaces.py
# selfdrive/car/tests/test_models.py
# selfdrive/test/process_replay/process_replay.py
# selfdrive/ui/qt/offroad/settings.cc
# selfdrive/ui/translations/main_ar.ts
# selfdrive/ui/translations/main_es.ts
# selfdrive/ui/translations/main_fr.ts
# selfdrive/ui/translations/main_ja.ts
# selfdrive/ui/translations/main_ko.ts
# selfdrive/ui/translations/main_pt-BR.ts
# selfdrive/ui/translations/main_th.ts
# selfdrive/ui/translations/main_tr.ts
# selfdrive/ui/translations/main_zh-CHS.ts
# selfdrive/ui/translations/main_zh-CHT.ts
2025-05-31 14:12:30 -04:00
discountchubbs
cf94bb130b
Merge branch commaai/openpilot:master into branch sunnypilot/sunnypilot:master-new
2025-05-27 16:28:45 -04:00
discountchubbs
21715cdc6d
Merge branch 'upstream/openpilot/master' into 0508-sync
2025-05-08 23:43:54 -04:00
Jason Wen
b6c6a3ad19
Merge branch 'upstream/openpilot/master' into sync-20250503
...
# Conflicts:
# opendbc_repo
# selfdrive/controls/lib/longitudinal_planner.py
# selfdrive/modeld/fill_model_msg.py
2025-05-04 13:21:27 -04:00
discountchubbs
7bf30c17b0
Merge remote-tracking branch 'openpilot/master' into sync-04-30
2025-04-30 22:57:14 -04:00
rav4kumar
cf9b45783d
Merge remote-tracking branch 'comma/master' into sync-20250427
2025-04-28 14:06:18 -04:00
Jason Wen
b9385a2368
Merge branch 'upstream/openpilot/master' into sync-20250422
...
# Conflicts:
# .github/workflows/selfdrive_tests.yaml
# .github/workflows/ui_preview.yaml
# common/params_keys.h
# opendbc_repo
# panda
# selfdrive/car/card.py
# selfdrive/car/tests/test_car_interfaces.py
# selfdrive/car/tests/test_models.py
# selfdrive/controls/lib/longitudinal_planner.py
# selfdrive/modeld/fill_model_msg.py
# selfdrive/test/process_replay/process_replay.py
# selfdrive/ui/qt/offroad/developer_panel.cc
# selfdrive/ui/qt/offroad/settings.cc
# selfdrive/ui/translations/main_de.ts
Sync: `commaai/opendbc:master` into `sunnypilot/opendbc:master-new`
Sync: `commaai/panda:master` into `sunnypilot/panda:master-new`
2025-04-23 00:44:53 -04:00
DevTekVE
1779a76d3c
Update default model to "Filet o Fish"
...
Changed the DEFAULT_MODEL constant and updated the associated model hash to reflect the new default. This ensures consistency between the code and the new model configuration.
2025-03-09 15:00:12 +01:00
Jason Wen
a0a1635c55
Merge branch 'upstream/openpilot/master' into sync-20250215
...
# Conflicts:
# common/params.cc
# opendbc_repo
# panda
# selfdrive/car/tests/test_models.py
# selfdrive/modeld/fill_model_msg.py
# selfdrive/test/process_replay/process_replay.py
# selfdrive/test/process_replay/ref_commit
# selfdrive/ui/qt/offroad/developer_panel.cc
# selfdrive/ui/tests/test_ui/run.py
# selfdrive/ui/translations/main_ar.ts
# selfdrive/ui/translations/main_de.ts
# selfdrive/ui/translations/main_es.ts
# selfdrive/ui/translations/main_fr.ts
# selfdrive/ui/translations/main_ja.ts
# selfdrive/ui/translations/main_ko.ts
# selfdrive/ui/translations/main_pt-BR.ts
# selfdrive/ui/translations/main_th.ts
# selfdrive/ui/translations/main_tr.ts
# selfdrive/ui/translations/main_zh-CHS.ts
# selfdrive/ui/translations/main_zh-CHT.ts
# system/athena/athenad.py
2025-02-16 22:10:32 -05:00
Jason Wen
767880ffaf
ui: Display default driving model name ( #623 )
...
* ui: Display default driving model if in use
* add ref commit and tests
* fix commit
* update msg
* update msg
* fix lint
* use sha256 hash instead
2025-01-27 22:49:28 -05:00
