Split all SP files out

This commit is contained in:
Jason Wen
2024-07-12 22:09:45 -04:00
parent bc1aad6f6a
commit e7ea608c45
59 changed files with 88 additions and 80 deletions
+6 -17
View File
@@ -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)
+1 -1
View File
@@ -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
-11
View File
@@ -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"
+1 -1
View File
@@ -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"
+19
View File
@@ -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')
@@ -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);
@@ -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 <QJsonArray>
#include <QJsonDocument>
@@ -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
@@ -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 <QJsonArray>
#include <QJsonDocument>
@@ -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
@@ -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);
@@ -3,8 +3,8 @@
#include <QObject>
#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
@@ -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);
@@ -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
@@ -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);
@@ -5,7 +5,7 @@
#include <deque>
#include <QDir>
#include "selfdrive/ui/qt/offroad/sunnypilot/json_fetcher.h"
#include "selfdrive/ui/sunnypilot/qt/offroad/json_fetcher.h"
static const std::tuple<QString, QString> defaultLocation = std::make_tuple("== None ==", "");
// New class LocationsFetcher that handles web requests and JSON parsing
@@ -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);
@@ -1,4 +1,4 @@
#include "selfdrive/ui/qt/offroad/sunnypilot/models_fetcher.h"
#include "selfdrive/ui/sunnypilot/qt/offroad/models_fetcher.h"
#include <QThread>
ModelsFetcher::ModelsFetcher(QObject* parent) : QObject(parent) {
@@ -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"
@@ -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);
@@ -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);
@@ -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"
@@ -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
@@ -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
@@ -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);
@@ -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);
@@ -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);
@@ -1,4 +1,4 @@
#include "selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.h"
#include "selfdrive/ui/sunnypilot/qt/offroad/sunnylink_settings.h"
#include <common/watchdog.h>
#include <QtConcurrent/QtConcurrent>
@@ -3,7 +3,7 @@
#include <QtCore/qjsonobject.h>
#include <QrCode.hpp>
#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"
@@ -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);
@@ -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"
@@ -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);
@@ -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
@@ -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);
@@ -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
@@ -1,4 +1,4 @@
#include "selfdrive/ui/qt/onroad_settings.h"
#include "selfdrive/ui/sunnypilot/qt/onroad/onroad_settings.h"
#include <utility>
@@ -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);
@@ -1,11 +1,11 @@
#include "selfdrive/ui/qt/onroad_settings_panel.h"
#include "../../../sunnypilot/qt/onroad/onroad_settings_panel.h"
#include <QHBoxLayout>
#include <QWidget>
#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);
@@ -1,4 +1,4 @@
#include "selfdrive/ui/qt/widgets/sunnypilot/drive_stats.h"
#include "selfdrive/ui/sunnypilot/qt/widgets/drive_stats.h"
#include <QDebug>
#include <QGridLayout>
+11
View File
@@ -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"
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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;