Commit Graph

10680 Commits

Author SHA1 Message Date
Jason Wen e615f34490 Merge branch 'hkg-can-jerk' into master-dev-c3 2024-07-31 00:03:17 -04:00
Jason Wen d472f129e6 stock stop distance again 2024-07-31 00:03:04 -04:00
Jason Wen 74481be4ff same rate up/down 2024-07-31 00:02:04 -04:00
Jason Wen 1dd9ed1042 more aggressive jerk 2024-07-31 00:00:09 -04:00
Jason Wen 9c02257bcf Merge branch 'pcm-long-disengage' into master-dev-c3 2024-07-30 23:57:13 -04:00
Jason Wen 03722f9090 try this out 2024-07-30 23:57:04 -04:00
Jason Wen 7da934c2c0 Merge branch 'car-params-check' into master-dev-c3 2024-07-30 23:06:18 -04:00
Jason Wen afb0c3fe42 read params in a thread instead 2024-07-30 22:59:47 -04:00
Jason Wen b2ba2aaab1 car: Check params before car state is updated 2024-07-30 17:49:49 -04:00
Jason Wen 7a85b34024 Merge branch 'mads-hkg-available-fix' into master-dev-c3 2024-07-30 17:46:30 -04:00
Jason Wen b4fd73141e not needed 2024-07-30 17:46:24 -04:00
Jason Wen 0c7268567f Merge branch 'mads-hkg-available-fix' into master-dev-c3
# Conflicts:
#	selfdrive/car/hyundai/interface.py
2024-07-30 14:17:47 -04:00
Jason Wen bce46b63da both 2024-07-30 14:17:30 -04:00
Jason Wen 4c664020f2 handle cruise main button universally 2024-07-30 11:44:40 -04:00
Jason Wen 85e0e8b526 Merge branch 'master' into mads-hkg-available-fix
# Conflicts:
#	selfdrive/car/hyundai/interface.py
2024-07-30 11:22:13 -04:00
Jason Wen 4d7afe3a7b MADS: Map cruise main and lateral buttons to button events (#361)
* MADS: Map cruise main and lateral buttons to button events

* different style

* nah
2024-07-30 10:58:35 -04:00
Jason Wen a4a7e76ddf Merge branch 'pcm-long-disengage' into master-dev-c3 2024-07-29 21:18:41 -04:00
Jason Wen 6185b82ed3 MADS: Honda: Fix PCM ACC disengage fault 2024-07-29 21:18:09 -04:00
Jason Wen 4e237e59a5 Translations: Add untranslated 2024-07-29 21:01:11 -04:00
Jason Wen 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
Jason Wen 294476fc33 oops flipped main 2024-07-29 15:38:30 -04:00
Jason Wen faff375b94 make sure main button is pressed 2024-07-29 15:38:30 -04:00
Jason Wen 4a53caff37 this is better 2024-07-29 15:38:30 -04:00
Jason Wen e6970ea15b handle states properly 2024-07-29 15:38:29 -04:00
Jaosn Wen c923a249df MADS: HKG CAN-FD: Disallow cruise buttons to engage when pcmCruiseSpeed is off 2024-07-29 15:38:29 -04:00
Jason Wen 8c37e54ed9 Merge branch 'new-button-events' into master-dev-c3
# Conflicts:
#	selfdrive/car/hyundai/interface.py
2024-07-29 15:20:53 -04:00
Jason Wen a7abe8c522 Merge branch 'mads-hkg-available-fix' into master-dev-c3 2024-07-29 15:19:22 -04:00
Jason Wen 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
Jason Wen 5382db2b19 missed from merge 2024-07-29 15:15:46 -04:00
Jason Wen 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
Jason Wen 707a45cb0a nah 2024-07-29 14:52:09 -04:00
Jason Wen bda51a3a86 different style 2024-07-29 14:50:10 -04:00
Jason Wen 6c185fb6ac MADS: Map cruise main and lateral buttons to button events 2024-07-29 14:36:02 -04:00
Jason Wen f92bc4b760 Merge branch 'hkg-can-jerk' into master-dev-c3 2024-07-29 07:18:30 -04:00
Jason Wen 4a2b96ae4e Revert "dynamic stopping distance"
This reverts commit cb76fb797f.
2024-07-29 07:18:21 -04:00
Jason Wen 41d0ee236d should be reverted 2024-07-29 07:10:40 -04:00
Jason Wen 1188307175 Merge branch 'hkg-can-jerk' into master-dev-c3 2024-07-29 07:10:02 -04:00
Jason Wen 447f76d9cf ui: Split sunnypilot into its own classes 2024-07-29 06:40:35 -04:00
Jason Wen be72a8ed06 Revert "Toyota: Auto Brake Hold"
This reverts commit 15d94a01
2024-07-29 06:40:34 -04:00
Jason Wen ca8c74bc0d MADS: Use modern button events parsing 2024-07-29 06:21:01 -04:00
Jason Wen 2f3d999c67 ui: Lead car chevron: Time to Lead Car 2024-07-29 06:21:01 -04:00
Jason Wen 05536bf439 Driving Model Selector v5: Bug fixes 2024-07-29 06:21:01 -04:00
Jaosn Wen e994c2cb96 Scons: Split sunnypilot/Sconscript 2024-07-29 06:20:37 -04:00
Jaosn Wen fb04ddc9a1 Scons: Set SUNNYPILOT to CPPDEFINES 2024-07-29 06:20:37 -04:00
Jason Wen 1fb0cb59a6 Scons: Build sunnypilot elements with added GPG keys 2024-07-29 06:20:37 -04:00
Jason Wen b55ae7f5f9 Revert "try this to make car stop a bit further"
This reverts commit 0487294495.
2024-07-28 22:44:10 -04:00
Jason Wen cb76fb797f dynamic stopping distance 2024-07-28 22:44:01 -04:00
Jason Wen f9be24b154 Revert "try this to make car stop a bit further"
This reverts commit 0487294495.
2024-07-28 22:32:44 -04:00
Jason Wen 6f4ba97e3d Merge branch 'hkg-can-jerk' into master-dev-c3 2024-07-28 14:20:05 -04:00
Jason Wen 0487294495 try this to make car stop a bit further 2024-07-28 14:19:52 -04:00