From e7ea608c4520d577ca9e0d183b9ea726a76797d1 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Fri, 12 Jul 2024 22:09:45 -0400 Subject: [PATCH] Split all SP files out --- selfdrive/ui/SConscript | 23 +++++-------------- selfdrive/ui/qt/offroad/settings.cc | 2 +- selfdrive/ui/qt/offroad/sunnypilot_main.h | 11 --------- selfdrive/ui/qt/onroad/onroad_home.cc | 2 +- selfdrive/ui/sunnypilot/SConscript | 19 +++++++++++++++ .../qt/network/sunnylink/models/role_model.h | 0 .../sunnylink/models/sponsor_role_model.h | 0 .../qt/network/sunnylink/models/user_model.h | 0 .../sunnylink/services/base_device_service.cc | 2 +- .../sunnylink/services/base_device_service.h | 0 .../sunnylink/services/role_service.cc | 2 +- .../network/sunnylink/services/role_service.h | 4 ++-- .../sunnylink/services/user_service.cc | 2 +- .../network/sunnylink/services/user_service.h | 4 ++-- .../qt/network/sunnylink/sunnylink_client.cc | 4 ++-- .../qt/network/sunnylink/sunnylink_client.h | 4 ++-- .../qt/offroad}/custom_offsets_settings.cc | 2 +- .../qt/offroad}/custom_offsets_settings.h | 0 .../qt/offroad}/display_settings.cc | 2 +- .../qt/offroad}/display_settings.h | 0 .../qt/offroad}/json_fetcher.h | 0 .../qt/offroad}/lane_change_settings.cc | 2 +- .../qt/offroad}/lane_change_settings.h | 0 .../qt/offroad}/locations_fetcher.h | 2 +- .../qt/offroad}/mads_settings.cc | 2 +- .../qt/offroad}/mads_settings.h | 0 .../qt/offroad}/models_fetcher.cc | 2 +- .../qt/offroad}/models_fetcher.h | 2 +- .../qt/offroad}/monitoring_settings.cc | 2 +- .../qt/offroad}/monitoring_settings.h | 0 .../qt/offroad}/osm_settings.cc | 2 +- .../qt/offroad}/osm_settings.h | 2 +- .../qt/offroad}/software_settings_sp.cc | 2 +- .../qt/offroad}/software_settings_sp.h | 2 +- .../offroad}/speed_limit_control_settings.cc | 2 +- .../offroad}/speed_limit_control_settings.h | 0 .../offroad}/speed_limit_policy_settings.cc | 2 +- .../qt/offroad}/speed_limit_policy_settings.h | 0 .../offroad}/speed_limit_warning_settings.cc | 2 +- .../offroad}/speed_limit_warning_settings.h | 0 .../qt/offroad}/sunnylink_settings.cc | 2 +- .../qt/offroad}/sunnylink_settings.h | 2 +- .../qt/offroad}/sunnypilot_settings.cc | 2 +- .../qt/offroad}/sunnypilot_settings.h | 12 +++++----- .../qt/offroad}/trips_settings.cc | 2 +- .../qt/offroad}/trips_settings.h | 2 +- .../qt/offroad}/vehicle_settings.cc | 2 +- .../qt/offroad}/vehicle_settings.h | 0 .../qt/offroad}/visuals_settings.cc | 2 +- .../qt/offroad}/visuals_settings.h | 0 .../qt/onroad}/onroad_settings.cc | 4 ++-- .../qt/onroad}/onroad_settings.h | 0 .../qt/onroad}/onroad_settings_panel.cc | 8 +++---- .../qt/onroad}/onroad_settings_panel.h | 0 .../qt/widgets}/drive_stats.cc | 2 +- .../qt/widgets}/drive_stats.h | 0 selfdrive/ui/sunnypilot/sunnypilot_main.h | 11 +++++++++ selfdrive/ui/ui.cc | 2 +- selfdrive/ui/ui.h | 6 ++--- 59 files changed, 88 insertions(+), 80 deletions(-) delete mode 100644 selfdrive/ui/qt/offroad/sunnypilot_main.h create mode 100644 selfdrive/ui/sunnypilot/SConscript rename selfdrive/ui/{ => sunnypilot}/qt/network/sunnylink/models/role_model.h (100%) rename selfdrive/ui/{ => sunnypilot}/qt/network/sunnylink/models/sponsor_role_model.h (100%) rename selfdrive/ui/{ => sunnypilot}/qt/network/sunnylink/models/user_model.h (100%) rename selfdrive/ui/{ => sunnypilot}/qt/network/sunnylink/services/base_device_service.cc (96%) rename selfdrive/ui/{ => sunnypilot}/qt/network/sunnylink/services/base_device_service.h (100%) rename selfdrive/ui/{ => sunnypilot}/qt/network/sunnylink/services/role_service.cc (88%) rename selfdrive/ui/{ => sunnypilot}/qt/network/sunnylink/services/role_service.h (74%) rename selfdrive/ui/{ => sunnypilot}/qt/network/sunnylink/services/user_service.cc (89%) rename selfdrive/ui/{ => sunnypilot}/qt/network/sunnylink/services/user_service.h (74%) rename selfdrive/ui/{ => sunnypilot}/qt/network/sunnylink/sunnylink_client.cc (50%) rename selfdrive/ui/{ => sunnypilot}/qt/network/sunnylink/sunnylink_client.h (61%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/custom_offsets_settings.cc (97%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/custom_offsets_settings.h (100%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/display_settings.cc (98%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/display_settings.h (100%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/json_fetcher.h (100%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/lane_change_settings.cc (98%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/lane_change_settings.h (100%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/locations_fetcher.h (97%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/mads_settings.cc (97%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/mads_settings.h (100%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/models_fetcher.cc (98%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/models_fetcher.h (98%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/monitoring_settings.cc (93%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/monitoring_settings.h (100%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/osm_settings.cc (99%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/osm_settings.h (99%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/software_settings_sp.cc (99%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/software_settings_sp.h (98%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/speed_limit_control_settings.cc (98%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/speed_limit_control_settings.h (100%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/speed_limit_policy_settings.cc (96%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/speed_limit_policy_settings.h (100%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/speed_limit_warning_settings.cc (98%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/speed_limit_warning_settings.h (100%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/sunnylink_settings.cc (99%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/sunnylink_settings.h (97%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/sunnypilot_settings.cc (99%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/sunnypilot_settings.h (87%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/trips_settings.cc (92%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/trips_settings.h (81%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/vehicle_settings.cc (99%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/vehicle_settings.h (100%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/visuals_settings.cc (98%) rename selfdrive/ui/{qt/offroad/sunnypilot => sunnypilot/qt/offroad}/visuals_settings.h (100%) rename selfdrive/ui/{qt => sunnypilot/qt/onroad}/onroad_settings.cc (99%) rename selfdrive/ui/{qt => sunnypilot/qt/onroad}/onroad_settings.h (100%) rename selfdrive/ui/{qt => sunnypilot/qt/onroad}/onroad_settings_panel.cc (75%) rename selfdrive/ui/{qt => sunnypilot/qt/onroad}/onroad_settings_panel.h (100%) rename selfdrive/ui/{qt/widgets/sunnypilot => sunnypilot/qt/widgets}/drive_stats.cc (98%) rename selfdrive/ui/{qt/widgets/sunnypilot => sunnypilot/qt/widgets}/drive_stats.h (100%) create mode 100644 selfdrive/ui/sunnypilot/sunnypilot_main.h diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index e1233b5cbc..7060a6e9ee 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -2,6 +2,9 @@ import os import json Import('qt_env', 'arch', 'common', 'messaging', 'visionipc', 'transformations', 'UBUNTU_FOCAL') +SConscript(['sunnypilot/SConscript']) +Import('sp_widgets_src', 'sp_qt_src') + base_libs = [common, messaging, visionipc, transformations, 'm', 'OpenCL', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"] @@ -22,20 +25,7 @@ widgets_src = ["ui.cc", "qt/widgets/input.cc", "qt/widgets/wifi.cc", "qt/widgets/ssh_keys.cc", "qt/widgets/toggle.cc", "qt/widgets/controls.cc", "qt/widgets/offroad_alerts.cc", "qt/widgets/prime.cc", "qt/widgets/keyboard.cc", "qt/widgets/scrollview.cc", "qt/widgets/cameraview.cc", "#third_party/qrcode/QrCode.cc", - "qt/request_repeater.cc", "qt/qt_window.cc", "qt/network/networking.cc", "qt/network/wifi_manager.cc"] - -widgets_src += ["qt/offroad/sunnypilot/display_settings.cc", "qt/offroad/sunnypilot/sunnypilot_settings.cc", - "qt/offroad/sunnypilot/vehicle_settings.cc", "qt/offroad/sunnypilot/visuals_settings.cc", - "qt/offroad/sunnypilot/trips_settings.cc", "qt/offroad/sunnypilot/mads_settings.cc", - "qt/offroad/sunnypilot/lane_change_settings.cc", "qt/offroad/sunnypilot/speed_limit_control_settings.cc", - "qt/offroad/sunnypilot/monitoring_settings.cc", "qt/offroad/sunnypilot/osm_settings.cc", - "qt/offroad/sunnypilot/custom_offsets_settings.cc", "qt/widgets/sunnypilot/drive_stats.cc", - "qt/offroad/sunnypilot/software_settings_sp.cc", "qt/offroad/sunnypilot/models_fetcher.cc", - "qt/offroad/sunnypilot/speed_limit_warning_settings.cc", "qt/offroad/sunnypilot/speed_limit_policy_settings.cc", - "qt/offroad/sunnypilot/sunnylink_settings.cc"] - -widgets_src += ["qt/network/sunnylink/sunnylink_client.cc", "qt/network/sunnylink/services/base_device_service.cc", - "qt/network/sunnylink/services/role_service.cc", "qt/network/sunnylink/services/user_service.cc"] + "qt/request_repeater.cc", "qt/qt_window.cc", "qt/network/networking.cc", "qt/network/wifi_manager.cc"] + sp_widgets_src qt_env['CPPDEFINES'] = [] if maps: @@ -53,8 +43,7 @@ qt_src = ["main.cc", "qt/sidebar.cc", "qt/body.cc", "qt/offroad/software_settings.cc", "qt/offroad/onboarding.cc", "qt/offroad/driverview.cc", "qt/offroad/experimental_mode.cc", "qt/onroad/onroad_home.cc", "qt/onroad/annotated_camera.cc", - "qt/onroad/buttons.cc", "qt/onroad/alerts.cc", - "qt/onroad_settings.cc", "qt/onroad_settings_panel.cc"] + "qt/onroad/buttons.cc", "qt/onroad/alerts.cc"] + sp_qt_src # build translation files with open(File("translations/languages.json").abspath) as f: @@ -94,7 +83,7 @@ qt_env.Program("_spinner", ["qt/spinner.cc"], LIBS=qt_libs) qt_env.Program("ui", qt_src + [asset_obj], LIBS=qt_libs) if GetOption('extras'): qt_src.remove("main.cc") # replaced by test_runner - #qt_env.Program('tests/test_translations', [asset_obj, 'tests/test_runner.cc', 'tests/test_translations.cc'] + qt_src, LIBS=qt_libs) + qt_env.Program('tests/test_translations', [asset_obj, 'tests/test_runner.cc', 'tests/test_translations.cc'] + qt_src, LIBS=qt_libs) qt_env.Program('tests/ui_snapshot', [asset_obj, "tests/ui_snapshot.cc"] + qt_src, LIBS=qt_libs) diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index f9f852a3b4..22448e895b 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -13,11 +13,11 @@ #include "common/util.h" #include "selfdrive/ui/qt/network/networking.h" #include "selfdrive/ui/qt/offroad/settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot_main.h" #include "selfdrive/ui/qt/qt_window.h" #include "selfdrive/ui/qt/widgets/prime.h" #include "selfdrive/ui/qt/widgets/scrollview.h" #include "selfdrive/ui/qt/widgets/ssh_keys.h" +#include "selfdrive/ui/sunnypilot/sunnypilot_main.h" TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { // param, title, desc, icon diff --git a/selfdrive/ui/qt/offroad/sunnypilot_main.h b/selfdrive/ui/qt/offroad/sunnypilot_main.h deleted file mode 100644 index fe4526db08..0000000000 --- a/selfdrive/ui/qt/offroad/sunnypilot_main.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "selfdrive/ui/qt/offroad/sunnypilot/display_settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/vehicle_settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/visuals_settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/trips_settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/monitoring_settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/osm_settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/software_settings_sp.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.h" diff --git a/selfdrive/ui/qt/onroad/onroad_home.cc b/selfdrive/ui/qt/onroad/onroad_home.cc index 7413cdff7e..2425c31aa9 100644 --- a/selfdrive/ui/qt/onroad/onroad_home.cc +++ b/selfdrive/ui/qt/onroad/onroad_home.cc @@ -7,7 +7,7 @@ #include "selfdrive/ui/qt/maps/map_helpers.h" #include "selfdrive/ui/qt/maps/map_panel.h" #endif -#include "selfdrive/ui/qt/onroad_settings_panel.h" +#include "selfdrive/ui/sunnypilot/qt/onroad/onroad_settings_panel.h" #include "selfdrive/ui/qt/util.h" diff --git a/selfdrive/ui/sunnypilot/SConscript b/selfdrive/ui/sunnypilot/SConscript new file mode 100644 index 0000000000..46b6e7c649 --- /dev/null +++ b/selfdrive/ui/sunnypilot/SConscript @@ -0,0 +1,19 @@ +widgets_src = ["sunnypilot/qt/offroad/display_settings.cc", "sunnypilot/qt/offroad/sunnypilot_settings.cc", + "sunnypilot/qt/offroad/vehicle_settings.cc", "sunnypilot/qt/offroad/visuals_settings.cc", + "sunnypilot/qt/offroad/trips_settings.cc", "sunnypilot/qt/offroad/mads_settings.cc", + "sunnypilot/qt/offroad/lane_change_settings.cc", "sunnypilot/qt/offroad/speed_limit_control_settings.cc", + "sunnypilot/qt/offroad/monitoring_settings.cc", "sunnypilot/qt/offroad/osm_settings.cc", + "sunnypilot/qt/offroad/custom_offsets_settings.cc", "sunnypilot/qt/widgets/drive_stats.cc", + "sunnypilot/qt/offroad/software_settings_sp.cc", "sunnypilot/qt/offroad/models_fetcher.cc", + "sunnypilot/qt/offroad/speed_limit_warning_settings.cc", "sunnypilot/qt/offroad/speed_limit_policy_settings.cc", + "sunnypilot/qt/offroad/sunnylink_settings.cc"] + +network_src = ["sunnypilot/qt/network/sunnylink/sunnylink_client.cc", "sunnypilot/qt/network/sunnylink/services/base_device_service.cc", + "sunnypilot/qt/network/sunnylink/services/role_service.cc", "sunnypilot/qt/network/sunnylink/services/user_service.cc"] + +qt_src = ["sunnypilot/qt/onroad/onroad_settings.cc", "sunnypilot/qt/onroad/onroad_settings_panel.cc"] + +sp_widgets_src = widgets_src + network_src +sp_qt_src = qt_src + +Export('sp_widgets_src', 'sp_qt_src') diff --git a/selfdrive/ui/qt/network/sunnylink/models/role_model.h b/selfdrive/ui/sunnypilot/qt/network/sunnylink/models/role_model.h similarity index 100% rename from selfdrive/ui/qt/network/sunnylink/models/role_model.h rename to selfdrive/ui/sunnypilot/qt/network/sunnylink/models/role_model.h diff --git a/selfdrive/ui/qt/network/sunnylink/models/sponsor_role_model.h b/selfdrive/ui/sunnypilot/qt/network/sunnylink/models/sponsor_role_model.h similarity index 100% rename from selfdrive/ui/qt/network/sunnylink/models/sponsor_role_model.h rename to selfdrive/ui/sunnypilot/qt/network/sunnylink/models/sponsor_role_model.h diff --git a/selfdrive/ui/qt/network/sunnylink/models/user_model.h b/selfdrive/ui/sunnypilot/qt/network/sunnylink/models/user_model.h similarity index 100% rename from selfdrive/ui/qt/network/sunnylink/models/user_model.h rename to selfdrive/ui/sunnypilot/qt/network/sunnylink/models/user_model.h diff --git a/selfdrive/ui/qt/network/sunnylink/services/base_device_service.cc b/selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.cc similarity index 96% rename from selfdrive/ui/qt/network/sunnylink/services/base_device_service.cc rename to selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.cc index 2f2561a49a..46752b38a4 100644 --- a/selfdrive/ui/qt/network/sunnylink/services/base_device_service.cc +++ b/selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.cc @@ -2,7 +2,7 @@ #include "common/swaglog.h" #include "selfdrive/ui/qt/util.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/sunnylink_settings.h" BaseDeviceService::BaseDeviceService(QObject* parent) : QObject(parent), initial_request(nullptr), repeater(nullptr) { param_watcher = new ParamWatcher(this); diff --git a/selfdrive/ui/qt/network/sunnylink/services/base_device_service.h b/selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.h similarity index 100% rename from selfdrive/ui/qt/network/sunnylink/services/base_device_service.h rename to selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.h diff --git a/selfdrive/ui/qt/network/sunnylink/services/role_service.cc b/selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.cc similarity index 88% rename from selfdrive/ui/qt/network/sunnylink/services/role_service.cc rename to selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.cc index 8bd0904421..e31d2af5fe 100644 --- a/selfdrive/ui/qt/network/sunnylink/services/role_service.cc +++ b/selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/network/sunnylink/services/role_service.h" +#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.h" #include #include diff --git a/selfdrive/ui/qt/network/sunnylink/services/role_service.h b/selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.h similarity index 74% rename from selfdrive/ui/qt/network/sunnylink/services/role_service.h rename to selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.h index bc40342982..13b5d0505b 100644 --- a/selfdrive/ui/qt/network/sunnylink/services/role_service.h +++ b/selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.h @@ -1,8 +1,8 @@ #ifndef ROLESERVICE_H #define ROLESERVICE_H -#include "selfdrive/ui/qt/network/sunnylink/services/base_device_service.h" -#include "selfdrive/ui/qt/network/sunnylink/models/role_model.h" +#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.h" +#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/models/role_model.h" class RoleService : public BaseDeviceService { Q_OBJECT diff --git a/selfdrive/ui/qt/network/sunnylink/services/user_service.cc b/selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.cc similarity index 89% rename from selfdrive/ui/qt/network/sunnylink/services/user_service.cc rename to selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.cc index 2d52421d69..9076dc6a5c 100644 --- a/selfdrive/ui/qt/network/sunnylink/services/user_service.cc +++ b/selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/network/sunnylink/services/user_service.h" +#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.h" #include #include diff --git a/selfdrive/ui/qt/network/sunnylink/services/user_service.h b/selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.h similarity index 74% rename from selfdrive/ui/qt/network/sunnylink/services/user_service.h rename to selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.h index e4af93fa29..53f490722c 100644 --- a/selfdrive/ui/qt/network/sunnylink/services/user_service.h +++ b/selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.h @@ -1,8 +1,8 @@ #ifndef USERSERVICE_H #define USERSERVICE_H -#include "selfdrive/ui/qt/network/sunnylink/services/base_device_service.h" -#include "selfdrive/ui/qt/network/sunnylink/models/user_model.h" +#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.h" +#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/models/user_model.h" class UserService : public BaseDeviceService { Q_OBJECT diff --git a/selfdrive/ui/qt/network/sunnylink/sunnylink_client.cc b/selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.cc similarity index 50% rename from selfdrive/ui/qt/network/sunnylink/sunnylink_client.cc rename to selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.cc index 2d1613c0eb..b56d9bd582 100644 --- a/selfdrive/ui/qt/network/sunnylink/sunnylink_client.cc +++ b/selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.cc @@ -1,5 +1,5 @@ -#include "selfdrive/ui/qt/network/sunnylink/sunnylink_client.h" -#include "selfdrive/ui/qt/network/sunnylink/services/user_service.h" +#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.h" +#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.h" SunnylinkClient::SunnylinkClient(QObject* parent) : QObject(parent) { role_service = new RoleService(parent); diff --git a/selfdrive/ui/qt/network/sunnylink/sunnylink_client.h b/selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.h similarity index 61% rename from selfdrive/ui/qt/network/sunnylink/sunnylink_client.h rename to selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.h index 872d80ccf7..cd802b590e 100644 --- a/selfdrive/ui/qt/network/sunnylink/sunnylink_client.h +++ b/selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.h @@ -3,8 +3,8 @@ #include -#include "selfdrive/ui/qt/network/sunnylink/services/role_service.h" -#include "selfdrive/ui/qt/network/sunnylink/services/user_service.h" +#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.h" +#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.h" class SunnylinkClient : public QObject { Q_OBJECT diff --git a/selfdrive/ui/qt/offroad/sunnypilot/custom_offsets_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/custom_offsets_settings.cc similarity index 97% rename from selfdrive/ui/qt/offroad/sunnypilot/custom_offsets_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/custom_offsets_settings.cc index 405eca50ce..689f42bb11 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/custom_offsets_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/custom_offsets_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/custom_offsets_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/custom_offsets_settings.h" CustomOffsetsSettings::CustomOffsetsSettings(QWidget* parent) : QWidget(parent) { QVBoxLayout* main_layout = new QVBoxLayout(this); diff --git a/selfdrive/ui/qt/offroad/sunnypilot/custom_offsets_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/custom_offsets_settings.h similarity index 100% rename from selfdrive/ui/qt/offroad/sunnypilot/custom_offsets_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/custom_offsets_settings.h diff --git a/selfdrive/ui/qt/offroad/sunnypilot/display_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/display_settings.cc similarity index 98% rename from selfdrive/ui/qt/offroad/sunnypilot/display_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/display_settings.cc index 5d11c8526c..02d723c363 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/display_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/display_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/display_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/display_settings.h" DisplayPanel::DisplayPanel(QWidget *parent) : ListWidget(parent, false) { // param, title, desc, icon diff --git a/selfdrive/ui/qt/offroad/sunnypilot/display_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/display_settings.h similarity index 100% rename from selfdrive/ui/qt/offroad/sunnypilot/display_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/display_settings.h diff --git a/selfdrive/ui/qt/offroad/sunnypilot/json_fetcher.h b/selfdrive/ui/sunnypilot/qt/offroad/json_fetcher.h similarity index 100% rename from selfdrive/ui/qt/offroad/sunnypilot/json_fetcher.h rename to selfdrive/ui/sunnypilot/qt/offroad/json_fetcher.h diff --git a/selfdrive/ui/qt/offroad/sunnypilot/lane_change_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/lane_change_settings.cc similarity index 98% rename from selfdrive/ui/qt/offroad/sunnypilot/lane_change_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/lane_change_settings.cc index 8f16091460..e950ab71c3 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/lane_change_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/lane_change_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/lane_change_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/lane_change_settings.h" LaneChangeSettings::LaneChangeSettings(QWidget* parent) : QWidget(parent) { QVBoxLayout* main_layout = new QVBoxLayout(this); diff --git a/selfdrive/ui/qt/offroad/sunnypilot/lane_change_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/lane_change_settings.h similarity index 100% rename from selfdrive/ui/qt/offroad/sunnypilot/lane_change_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/lane_change_settings.h diff --git a/selfdrive/ui/qt/offroad/sunnypilot/locations_fetcher.h b/selfdrive/ui/sunnypilot/qt/offroad/locations_fetcher.h similarity index 97% rename from selfdrive/ui/qt/offroad/sunnypilot/locations_fetcher.h rename to selfdrive/ui/sunnypilot/qt/offroad/locations_fetcher.h index 1e5b20139f..e79c6f2e94 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/locations_fetcher.h +++ b/selfdrive/ui/sunnypilot/qt/offroad/locations_fetcher.h @@ -5,7 +5,7 @@ #include #include -#include "selfdrive/ui/qt/offroad/sunnypilot/json_fetcher.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/json_fetcher.h" static const std::tuple defaultLocation = std::make_tuple("== None ==", ""); // New class LocationsFetcher that handles web requests and JSON parsing diff --git a/selfdrive/ui/qt/offroad/sunnypilot/mads_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/mads_settings.cc similarity index 97% rename from selfdrive/ui/qt/offroad/sunnypilot/mads_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/mads_settings.cc index e213cc19a7..0a3ced7c69 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/mads_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/mads_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/mads_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/mads_settings.h" MadsSettings::MadsSettings(QWidget* parent) : QWidget(parent) { QVBoxLayout* main_layout = new QVBoxLayout(this); diff --git a/selfdrive/ui/qt/offroad/sunnypilot/mads_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/mads_settings.h similarity index 100% rename from selfdrive/ui/qt/offroad/sunnypilot/mads_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/mads_settings.h diff --git a/selfdrive/ui/qt/offroad/sunnypilot/models_fetcher.cc b/selfdrive/ui/sunnypilot/qt/offroad/models_fetcher.cc similarity index 98% rename from selfdrive/ui/qt/offroad/sunnypilot/models_fetcher.cc rename to selfdrive/ui/sunnypilot/qt/offroad/models_fetcher.cc index 3df9c09fe3..a46e75706e 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/models_fetcher.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/models_fetcher.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/models_fetcher.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/models_fetcher.h" #include ModelsFetcher::ModelsFetcher(QObject* parent) : QObject(parent) { diff --git a/selfdrive/ui/qt/offroad/sunnypilot/models_fetcher.h b/selfdrive/ui/sunnypilot/qt/offroad/models_fetcher.h similarity index 98% rename from selfdrive/ui/qt/offroad/sunnypilot/models_fetcher.h rename to selfdrive/ui/sunnypilot/qt/offroad/models_fetcher.h index 22ab81e541..8154065e6b 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/models_fetcher.h +++ b/selfdrive/ui/sunnypilot/qt/offroad/models_fetcher.h @@ -11,7 +11,7 @@ #include "common/util.h" #include "selfdrive/ui/ui.h" #include "selfdrive/ui/qt/util.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/json_fetcher.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/json_fetcher.h" #include "selfdrive/ui/qt/widgets/controls.h" #include "system/hardware/hw.h" diff --git a/selfdrive/ui/qt/offroad/sunnypilot/monitoring_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/monitoring_settings.cc similarity index 93% rename from selfdrive/ui/qt/offroad/sunnypilot/monitoring_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/monitoring_settings.cc index e2a410f9ff..7d740a3586 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/monitoring_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/monitoring_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/monitoring_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/monitoring_settings.h" MonitoringPanel::MonitoringPanel(QWidget *parent) : QFrame(parent) { main_layout = new QStackedLayout(this); diff --git a/selfdrive/ui/qt/offroad/sunnypilot/monitoring_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/monitoring_settings.h similarity index 100% rename from selfdrive/ui/qt/offroad/sunnypilot/monitoring_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/monitoring_settings.h diff --git a/selfdrive/ui/qt/offroad/sunnypilot/osm_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/osm_settings.cc similarity index 99% rename from selfdrive/ui/qt/offroad/sunnypilot/osm_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/osm_settings.cc index 236e4406cf..be3837262a 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/osm_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/osm_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/osm_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/osm_settings.h" OsmPanel::OsmPanel(QWidget *parent) : QFrame(parent) { main_layout = new QStackedLayout(this); diff --git a/selfdrive/ui/qt/offroad/sunnypilot/osm_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/osm_settings.h similarity index 99% rename from selfdrive/ui/qt/offroad/sunnypilot/osm_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/osm_settings.h index 2f9cf8455f..cc2556b150 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/osm_settings.h +++ b/selfdrive/ui/sunnypilot/qt/offroad/osm_settings.h @@ -10,7 +10,7 @@ #include "common/swaglog.h" #include "selfdrive/ui/qt/network/wifi_manager.h" #include "selfdrive/ui/qt/widgets/controls.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/locations_fetcher.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/locations_fetcher.h" #include "selfdrive/ui/qt/widgets/scrollview.h" #include "selfdrive/ui/qt/util.h" #include "selfdrive/ui/ui.h" diff --git a/selfdrive/ui/qt/offroad/sunnypilot/software_settings_sp.cc b/selfdrive/ui/sunnypilot/qt/offroad/software_settings_sp.cc similarity index 99% rename from selfdrive/ui/qt/offroad/sunnypilot/software_settings_sp.cc rename to selfdrive/ui/sunnypilot/qt/offroad/software_settings_sp.cc index bbe8572797..ce6a6712e6 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/software_settings_sp.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/software_settings_sp.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/software_settings_sp.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/software_settings_sp.h" SoftwarePanelSP::SoftwarePanelSP(QWidget *parent) : SoftwarePanel(parent) { // Get current model name and create new ButtonControl diff --git a/selfdrive/ui/qt/offroad/sunnypilot/software_settings_sp.h b/selfdrive/ui/sunnypilot/qt/offroad/software_settings_sp.h similarity index 98% rename from selfdrive/ui/qt/offroad/sunnypilot/software_settings_sp.h rename to selfdrive/ui/sunnypilot/qt/offroad/software_settings_sp.h index 384a592de4..4f8fc0d22a 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/software_settings_sp.h +++ b/selfdrive/ui/sunnypilot/qt/offroad/software_settings_sp.h @@ -3,7 +3,7 @@ #include "common/model.h" #include "selfdrive/ui/ui.h" #include "selfdrive/ui/qt/offroad/settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/models_fetcher.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/models_fetcher.h" class SoftwarePanelSP final : public SoftwarePanel { Q_OBJECT diff --git a/selfdrive/ui/qt/offroad/sunnypilot/speed_limit_control_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/speed_limit_control_settings.cc similarity index 98% rename from selfdrive/ui/qt/offroad/sunnypilot/speed_limit_control_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/speed_limit_control_settings.cc index 7686f0a873..13b1b715d4 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/speed_limit_control_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/speed_limit_control_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/speed_limit_control_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/speed_limit_control_settings.h" SlcSettings::SlcSettings(QWidget* parent) : QWidget(parent) { QVBoxLayout* main_layout = new QVBoxLayout(this); diff --git a/selfdrive/ui/qt/offroad/sunnypilot/speed_limit_control_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/speed_limit_control_settings.h similarity index 100% rename from selfdrive/ui/qt/offroad/sunnypilot/speed_limit_control_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/speed_limit_control_settings.h diff --git a/selfdrive/ui/qt/offroad/sunnypilot/speed_limit_policy_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/speed_limit_policy_settings.cc similarity index 96% rename from selfdrive/ui/qt/offroad/sunnypilot/speed_limit_policy_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/speed_limit_policy_settings.cc index 2de70e9b30..f93b14d62d 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/speed_limit_policy_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/speed_limit_policy_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/speed_limit_policy_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/speed_limit_policy_settings.h" SpeedLimitPolicySettings::SpeedLimitPolicySettings(QWidget* parent) : QWidget(parent) { QVBoxLayout* main_layout = new QVBoxLayout(this); diff --git a/selfdrive/ui/qt/offroad/sunnypilot/speed_limit_policy_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/speed_limit_policy_settings.h similarity index 100% rename from selfdrive/ui/qt/offroad/sunnypilot/speed_limit_policy_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/speed_limit_policy_settings.h diff --git a/selfdrive/ui/qt/offroad/sunnypilot/speed_limit_warning_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/speed_limit_warning_settings.cc similarity index 98% rename from selfdrive/ui/qt/offroad/sunnypilot/speed_limit_warning_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/speed_limit_warning_settings.cc index 6b355e2740..16557c1228 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/speed_limit_warning_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/speed_limit_warning_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/speed_limit_warning_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/speed_limit_warning_settings.h" SpeedLimitWarningSettings::SpeedLimitWarningSettings(QWidget* parent) : QWidget(parent) { QVBoxLayout* main_layout = new QVBoxLayout(this); diff --git a/selfdrive/ui/qt/offroad/sunnypilot/speed_limit_warning_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/speed_limit_warning_settings.h similarity index 100% rename from selfdrive/ui/qt/offroad/sunnypilot/speed_limit_warning_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/speed_limit_warning_settings.h diff --git a/selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/sunnylink_settings.cc similarity index 99% rename from selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/sunnylink_settings.cc index 1ebaf4f14e..c363e5655f 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/sunnylink_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/sunnylink_settings.h" #include #include diff --git a/selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/sunnylink_settings.h similarity index 97% rename from selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/sunnylink_settings.h index fdca62d1c5..5a7ead697a 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.h +++ b/selfdrive/ui/sunnypilot/qt/offroad/sunnylink_settings.h @@ -3,7 +3,7 @@ #include #include -#include "selfdrive/ui/qt/network/sunnylink/sunnylink_client.h" +#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.h" #include "selfdrive/ui/ui.h" #include "selfdrive/ui/qt/util.h" diff --git a/selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/sunnypilot_settings.cc similarity index 99% rename from selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/sunnypilot_settings.cc index 8db23500b4..055bb648a4 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/sunnypilot_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/sunnypilot_settings.h" SunnypilotPanel::SunnypilotPanel(QWidget *parent) : QFrame(parent) { main_layout = new QStackedLayout(this); diff --git a/selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/sunnypilot_settings.h similarity index 87% rename from selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/sunnypilot_settings.h index 8026cf7f1b..379a9a2875 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.h +++ b/selfdrive/ui/sunnypilot/qt/offroad/sunnypilot_settings.h @@ -2,12 +2,12 @@ #include "common/model.h" #include "selfdrive/ui/ui.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/custom_offsets_settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/lane_change_settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/mads_settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/speed_limit_control_settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/speed_limit_warning_settings.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/speed_limit_policy_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/custom_offsets_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/lane_change_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/mads_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/speed_limit_control_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/speed_limit_warning_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/speed_limit_policy_settings.h" #include "selfdrive/ui/qt/util.h" #include "selfdrive/ui/qt/widgets/controls.h" #include "selfdrive/ui/qt/widgets/scrollview.h" diff --git a/selfdrive/ui/qt/offroad/sunnypilot/trips_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/trips_settings.cc similarity index 92% rename from selfdrive/ui/qt/offroad/sunnypilot/trips_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/trips_settings.cc index e21dc675ae..0f080926b4 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/trips_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/trips_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/trips_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/trips_settings.h" TripsPanel::TripsPanel(QWidget* parent) : QFrame(parent) { QVBoxLayout* main_layout = new QVBoxLayout(this); diff --git a/selfdrive/ui/qt/offroad/sunnypilot/trips_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/trips_settings.h similarity index 81% rename from selfdrive/ui/qt/offroad/sunnypilot/trips_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/trips_settings.h index dc77acac75..539bdb2677 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/trips_settings.h +++ b/selfdrive/ui/sunnypilot/qt/offroad/trips_settings.h @@ -1,7 +1,7 @@ #pragma once #include "selfdrive/ui/qt/widgets/controls.h" -#include "selfdrive/ui/qt/widgets/sunnypilot/drive_stats.h" +#include "selfdrive/ui/sunnypilot/qt/widgets/drive_stats.h" class TripsPanel : public QFrame { Q_OBJECT diff --git a/selfdrive/ui/qt/offroad/sunnypilot/vehicle_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/vehicle_settings.cc similarity index 99% rename from selfdrive/ui/qt/offroad/sunnypilot/vehicle_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/vehicle_settings.cc index ef0954c1ed..42222f0b2b 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/vehicle_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/vehicle_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/vehicle_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/vehicle_settings.h" VehiclePanel::VehiclePanel(QWidget *parent) : QWidget(parent) { main_layout = new QStackedLayout(this); diff --git a/selfdrive/ui/qt/offroad/sunnypilot/vehicle_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/vehicle_settings.h similarity index 100% rename from selfdrive/ui/qt/offroad/sunnypilot/vehicle_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/vehicle_settings.h diff --git a/selfdrive/ui/qt/offroad/sunnypilot/visuals_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/visuals_settings.cc similarity index 98% rename from selfdrive/ui/qt/offroad/sunnypilot/visuals_settings.cc rename to selfdrive/ui/sunnypilot/qt/offroad/visuals_settings.cc index 46bd84b6d9..364c1e2f6d 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/visuals_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/visuals_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/offroad/sunnypilot/visuals_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/visuals_settings.h" VisualsPanel::VisualsPanel(QWidget *parent) : ListWidget(parent) { // param, title, desc, icon diff --git a/selfdrive/ui/qt/offroad/sunnypilot/visuals_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/visuals_settings.h similarity index 100% rename from selfdrive/ui/qt/offroad/sunnypilot/visuals_settings.h rename to selfdrive/ui/sunnypilot/qt/offroad/visuals_settings.h diff --git a/selfdrive/ui/qt/onroad_settings.cc b/selfdrive/ui/sunnypilot/qt/onroad/onroad_settings.cc similarity index 99% rename from selfdrive/ui/qt/onroad_settings.cc rename to selfdrive/ui/sunnypilot/qt/onroad/onroad_settings.cc index 00810294ba..4ef4afc025 100644 --- a/selfdrive/ui/qt/onroad_settings.cc +++ b/selfdrive/ui/sunnypilot/qt/onroad/onroad_settings.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/onroad_settings.h" +#include "selfdrive/ui/sunnypilot/qt/onroad/onroad_settings.h" #include @@ -7,7 +7,7 @@ #include "common/util.h" #include "selfdrive/ui/qt/widgets/scrollview.h" -#include "selfdrive/ui/qt/offroad/sunnypilot/speed_limit_policy_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/speed_limit_policy_settings.h" OnroadSettings::OnroadSettings(bool closeable, QWidget *parent) : QFrame(parent) { setContentsMargins(0, 0, 0, 0); diff --git a/selfdrive/ui/qt/onroad_settings.h b/selfdrive/ui/sunnypilot/qt/onroad/onroad_settings.h similarity index 100% rename from selfdrive/ui/qt/onroad_settings.h rename to selfdrive/ui/sunnypilot/qt/onroad/onroad_settings.h diff --git a/selfdrive/ui/qt/onroad_settings_panel.cc b/selfdrive/ui/sunnypilot/qt/onroad/onroad_settings_panel.cc similarity index 75% rename from selfdrive/ui/qt/onroad_settings_panel.cc rename to selfdrive/ui/sunnypilot/qt/onroad/onroad_settings_panel.cc index 163f0fb31f..8a8283fad3 100644 --- a/selfdrive/ui/qt/onroad_settings_panel.cc +++ b/selfdrive/ui/sunnypilot/qt/onroad/onroad_settings_panel.cc @@ -1,11 +1,11 @@ -#include "selfdrive/ui/qt/onroad_settings_panel.h" +#include "../../../sunnypilot/qt/onroad/onroad_settings_panel.h" #include #include -#include "selfdrive/ui/qt/onroad_settings.h" -#include "selfdrive/ui/qt/util.h" -#include "selfdrive/ui/ui.h" +#include "selfdrive/ui/sunnypilot/qt/onroad/onroad_settings.h" +#include "../../../qt/util.h" +#include "../../../ui.h" OnroadSettingsPanel::OnroadSettingsPanel(QWidget *parent) : QFrame(parent) { content_stack = new QStackedLayout(this); diff --git a/selfdrive/ui/qt/onroad_settings_panel.h b/selfdrive/ui/sunnypilot/qt/onroad/onroad_settings_panel.h similarity index 100% rename from selfdrive/ui/qt/onroad_settings_panel.h rename to selfdrive/ui/sunnypilot/qt/onroad/onroad_settings_panel.h diff --git a/selfdrive/ui/qt/widgets/sunnypilot/drive_stats.cc b/selfdrive/ui/sunnypilot/qt/widgets/drive_stats.cc similarity index 98% rename from selfdrive/ui/qt/widgets/sunnypilot/drive_stats.cc rename to selfdrive/ui/sunnypilot/qt/widgets/drive_stats.cc index e4c127e6b5..2ac3f59893 100644 --- a/selfdrive/ui/qt/widgets/sunnypilot/drive_stats.cc +++ b/selfdrive/ui/sunnypilot/qt/widgets/drive_stats.cc @@ -1,4 +1,4 @@ -#include "selfdrive/ui/qt/widgets/sunnypilot/drive_stats.h" +#include "selfdrive/ui/sunnypilot/qt/widgets/drive_stats.h" #include #include diff --git a/selfdrive/ui/qt/widgets/sunnypilot/drive_stats.h b/selfdrive/ui/sunnypilot/qt/widgets/drive_stats.h similarity index 100% rename from selfdrive/ui/qt/widgets/sunnypilot/drive_stats.h rename to selfdrive/ui/sunnypilot/qt/widgets/drive_stats.h diff --git a/selfdrive/ui/sunnypilot/sunnypilot_main.h b/selfdrive/ui/sunnypilot/sunnypilot_main.h new file mode 100644 index 0000000000..c94e13050d --- /dev/null +++ b/selfdrive/ui/sunnypilot/sunnypilot_main.h @@ -0,0 +1,11 @@ +#pragma once + +#include "selfdrive/ui/sunnypilot/qt/offroad/display_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/sunnypilot_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/vehicle_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/visuals_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/trips_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/monitoring_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/osm_settings.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/software_settings_sp.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/sunnylink_settings.h" diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index 126be0d6b1..72571c4b85 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -11,7 +11,7 @@ #include "common/swaglog.h" #include "common/util.h" #include "common/watchdog.h" -#include "qt/network/sunnylink/models/role_model.h" +#include "sunnypilot/qt/network/sunnylink/models/role_model.h" #include "system/hardware/hw.h" #define BACKLIGHT_DT 0.05 diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h index a9fb6f0671..eb02b8d2d8 100644 --- a/selfdrive/ui/ui.h +++ b/selfdrive/ui/ui.h @@ -15,9 +15,9 @@ #include "common/mat.h" #include "common/params.h" #include "common/timing.h" -#include "qt/network/sunnylink/models/role_model.h" -#include "qt/network/sunnylink/models/sponsor_role_model.h" -#include "qt/network/sunnylink/models/user_model.h" +#include "sunnypilot/qt/network/sunnylink/models/role_model.h" +#include "sunnypilot/qt/network/sunnylink/models/sponsor_role_model.h" +#include "sunnypilot/qt/network/sunnylink/models/user_model.h" #include "system/hardware/hw.h" const int UI_BORDER_SIZE = 30;