d80dceee92
Merge branch 'mads-hkg-available-fix' into master-dev-c3
...
# Conflicts:
# selfdrive/car/hyundai/interface.py
2024-07-29 15:46:37 -04:00
bdb7fa4bf8
same behavior
2024-07-29 15:44:05 -04:00
294476fc33
oops flipped main
2024-07-29 15:38:30 -04:00
faff375b94
make sure main button is pressed
2024-07-29 15:38:30 -04:00
4a53caff37
this is better
2024-07-29 15:38:30 -04:00
e6970ea15b
handle states properly
2024-07-29 15:38:29 -04:00
c923a249df
MADS: HKG CAN-FD: Disallow cruise buttons to engage when pcmCruiseSpeed is off
2024-07-29 15:38:29 -04:00
33fbf2718c
Merge branch 'master' into master-dev-c3
2024-07-29 15:25:53 -04:00
1f770e1bea
Submodule: Point to panda on GitHub
2024-07-29 15:25:44 -04:00
8c37e54ed9
Merge branch 'new-button-events' into master-dev-c3
...
# Conflicts:
# selfdrive/car/hyundai/interface.py
2024-07-29 15:20:53 -04:00
a7abe8c522
Merge branch 'mads-hkg-available-fix' into master-dev-c3
2024-07-29 15:19:22 -04:00
8cc99f0cd0
Merge branch 'master' into mads-hkg-available-fix
...
# Conflicts:
# SConstruct
# selfdrive/ui/SConscript
# selfdrive/ui/sunnypilot/SConscript
2024-07-29 15:19:03 -04:00
b8d3f9a16f
use upstream msgq
2024-07-29 15:16:50 -04:00
5382db2b19
missed from merge
2024-07-29 15:15:46 -04:00
2734aa7eb7
Merge branch 'master' into master-dev-c3
...
# Conflicts:
# .gitlab-ci.yml
# CHANGELOGS.md
# SConstruct
# panda
# selfdrive/car/ford/carstate.py
# selfdrive/car/ford/interface.py
# selfdrive/car/ford/values.py
# selfdrive/car/gm/interface.py
# selfdrive/car/hyundai/interface.py
# selfdrive/ui/qt/api.h
# selfdrive/ui/qt/home.cc
# selfdrive/ui/qt/home.h
# selfdrive/ui/qt/offroad/settings.cc
# selfdrive/ui/qt/offroad_home.cc
# selfdrive/ui/qt/offroad_home.h
# selfdrive/ui/qt/onroad/buttons.cc
# selfdrive/ui/qt/onroad/buttons.h
# selfdrive/ui/qt/onroad/onroad_home.h
# selfdrive/ui/qt/request_repeater.cc
# selfdrive/ui/qt/request_repeater.h
# selfdrive/ui/qt/sidebar.h
# selfdrive/ui/qt/widgets/toggle.h
# selfdrive/ui/qt/window.h
# selfdrive/ui/sunnypilot/qt/api.cc
# selfdrive/ui/sunnypilot/qt/api.h
# selfdrive/ui/sunnypilot/qt/common/json_fetcher.h
# selfdrive/ui/sunnypilot/qt/home.cc
# selfdrive/ui/sunnypilot/qt/home.h
# selfdrive/ui/sunnypilot/qt/maps/map.cc
# selfdrive/ui/sunnypilot/qt/maps/map.h
# selfdrive/ui/sunnypilot/qt/maps/map_helpers.h
# selfdrive/ui/sunnypilot/qt/network/networking.cc
# selfdrive/ui/sunnypilot/qt/network/networking.h
# selfdrive/ui/sunnypilot/qt/network/sunnylink/models/role_model.h
# selfdrive/ui/sunnypilot/qt/network/sunnylink/models/sponsor_role_model.h
# selfdrive/ui/sunnypilot/qt/network/sunnylink/models/user_model.h
# selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.cc
# selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.h
# selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.cc
# selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.h
# selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.cc
# selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.h
# selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.cc
# selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/display_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/display_settings.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/monitoring_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/monitoring_settings.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/onboarding.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/onboarding.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/osm/models_fetcher.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/osm_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/osm_settings.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/software_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/software_settings.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink_settings.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/custom_offsets_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/custom_offsets_settings.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/lane_change_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/lane_change_settings.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/mads_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/mads_settings.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_control_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_policy_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_warning_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot_settings.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/trips_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/trips_settings.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.h
# selfdrive/ui/sunnypilot/qt/offroad/settings/visuals_settings.cc
# selfdrive/ui/sunnypilot/qt/offroad/settings/visuals_settings.h
# selfdrive/ui/sunnypilot/qt/offroad_home.cc
# selfdrive/ui/sunnypilot/qt/offroad_home.h
# selfdrive/ui/sunnypilot/qt/onroad/annotated_camera.cc
# selfdrive/ui/sunnypilot/qt/onroad/annotated_camera.h
# selfdrive/ui/sunnypilot/qt/onroad/buttons.cc
# selfdrive/ui/sunnypilot/qt/onroad/buttons.h
# selfdrive/ui/sunnypilot/qt/onroad/developer_ui/developer_ui.cc
# selfdrive/ui/sunnypilot/qt/onroad/developer_ui/developer_ui.h
# selfdrive/ui/sunnypilot/qt/onroad/developer_ui/ui_elements.h
# selfdrive/ui/sunnypilot/qt/onroad/onroad_home.cc
# selfdrive/ui/sunnypilot/qt/onroad/onroad_home.h
# selfdrive/ui/sunnypilot/qt/onroad/onroad_settings.cc
# selfdrive/ui/sunnypilot/qt/onroad/onroad_settings_panel.cc
# selfdrive/ui/sunnypilot/qt/onroad/onroad_settings_panel.h
# selfdrive/ui/sunnypilot/qt/request_repeater.cc
# selfdrive/ui/sunnypilot/qt/request_repeater.h
# selfdrive/ui/sunnypilot/qt/sidebar.cc
# selfdrive/ui/sunnypilot/qt/sidebar.h
# selfdrive/ui/sunnypilot/qt/text.cc
# selfdrive/ui/sunnypilot/qt/ui_scene.h
# selfdrive/ui/sunnypilot/qt/util.cc
# selfdrive/ui/sunnypilot/qt/util.h
# selfdrive/ui/sunnypilot/qt/widgets/controls.cc
# selfdrive/ui/sunnypilot/qt/widgets/controls.h
# selfdrive/ui/sunnypilot/qt/widgets/drive_stats.cc
# selfdrive/ui/sunnypilot/qt/widgets/drive_stats.h
# selfdrive/ui/sunnypilot/qt/widgets/scrollview.cc
# selfdrive/ui/sunnypilot/qt/widgets/scrollview.h
# selfdrive/ui/sunnypilot/qt/widgets/toggle.cc
# selfdrive/ui/sunnypilot/qt/widgets/toggle.h
# selfdrive/ui/sunnypilot/qt/window.cc
# selfdrive/ui/sunnypilot/qt/window.h
# selfdrive/ui/sunnypilot/sunnypilot_main.h
# selfdrive/ui/sunnypilot/ui.cc
# selfdrive/ui/sunnypilot/ui.h
# 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
# selfdrive/ui/ui.h
2024-07-29 15:12:27 -04:00
707a45cb0a
nah
2024-07-29 14:52:09 -04:00
bda51a3a86
different style
2024-07-29 14:50:10 -04:00
6c185fb6ac
MADS: Map cruise main and lateral buttons to button events
2024-07-29 14:36:02 -04:00
f92bc4b760
Merge branch 'hkg-can-jerk' into master-dev-c3
2024-07-29 07:18:30 -04:00
4a2b96ae4e
Revert "dynamic stopping distance"
...
This reverts commit cb76fb797f
2024-07-29 07:18:21 -04:00
41d0ee236d
should be reverted
2024-07-29 07:10:40 -04:00
1188307175
Merge branch 'hkg-can-jerk' into master-dev-c3
2024-07-29 07:10:02 -04:00
eb1b0d7ddc
Update public panda submodule
2024-07-29 06:55:29 -04:00
447f76d9cf
ui: Split sunnypilot into its own classes
2024-07-29 06:40:35 -04:00
be72a8ed06
Revert "Toyota: Auto Brake Hold"
...
This reverts commit 15d94a01
2024-07-29 06:40:34 -04:00
7e31333b36
Add Custom MIT License
2024-07-29 06:40:34 -04:00
c26fd9d7c0
Add new parameters for enabling GitLab runner and Sunnylink uploader
2024-07-29 06:21:01 -04:00
ca8c74bc0d
MADS: Use modern button events parsing
2024-07-29 06:21:01 -04:00
2f3d999c67
ui: Lead car chevron: Time to Lead Car
2024-07-29 06:21:01 -04:00
05536bf439
Driving Model Selector v5: Bug fixes
2024-07-29 06:21:01 -04:00
e994c2cb96
Scons: Split sunnypilot/Sconscript
2024-07-29 06:20:37 -04:00
fb04ddc9a1
Scons: Set SUNNYPILOT to CPPDEFINES
2024-07-29 06:20:37 -04:00
1fb0cb59a6
Scons: Build sunnypilot elements with added GPG keys
2024-07-29 06:20:37 -04:00
e24271aa2b
Processor definition check for __APPLE__ has a typo on replay ( #32930 )
...
(cherry picked from commit 3c74ad145e
2024-07-29 06:20:37 -04:00
b55ae7f5f9
Revert "try this to make car stop a bit further"
...
This reverts commit 0487294495
2024-07-28 22:44:10 -04:00
cb76fb797f
dynamic stopping distance
2024-07-28 22:44:01 -04:00
f9be24b154
Revert "try this to make car stop a bit further"
...
This reverts commit 0487294495
2024-07-28 22:32:44 -04:00
6f4ba97e3d
Merge branch 'hkg-can-jerk' into master-dev-c3
2024-07-28 14:20:05 -04:00
0487294495
try this to make car stop a bit further
2024-07-28 14:19:52 -04:00
8f3b091381
Merge branch 'ui-sp-split' into master-dev-c3
2024-07-27 23:59:06 -04:00
abe5fc9146
map: working!!!
2024-07-27 23:58:44 -04:00
a47a992871
map: less
2024-07-27 23:27:46 -04:00
b9785e33e7
use sp's
2024-07-27 23:26:16 -04:00
93b8435eaa
Merge branch 'refs/heads/ui-sp-split' into master-dev-c3
2024-07-27 23:11:53 +02:00
0894686bb5
Refactor brightness update logic in DeviceSP
...
Remove redundant brightness calculation from DeviceSP by leveraging Device's implementation. Introduce a conditional return to handle Sunnypilot-specific logic cleanly.
2024-07-27 23:09:30 +02:00
f242f6b55d
No more rave
2024-07-27 23:07:19 +02:00
3c8acc8c77
Add override to updateBrightness in DeviceSP
...
Implemented an override for the updateBrightness function in DeviceSP. This ensures proper handling of UIState type by dynamically casting it to UIStateSP.
2024-07-27 22:47:52 +02:00
68330cea27
Merge branch 'ui-sp-split' into master-dev-c3
2024-07-27 15:13:32 -04:00
9d0ba054f3
make sure map rendering is compiled
2024-07-27 15:08:39 -04:00
c10121b570
unused
2024-07-27 14:40:50 -04:00
Jason Wen