From 9b036682a31346fb18f58d45b8fd68cc9012f2eb Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 17 Feb 2024 14:34:10 -0600 Subject: [PATCH] wip --- debug.sh | 2 ++ selfdrive/oscarpilot/settings/settings.cc | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 debug.sh diff --git a/debug.sh b/debug.sh new file mode 100644 index 0000000..853ddba --- /dev/null +++ b/debug.sh @@ -0,0 +1,2 @@ +cd selfdrive/ui +gdb ./ui diff --git a/selfdrive/oscarpilot/settings/settings.cc b/selfdrive/oscarpilot/settings/settings.cc index a2a2d86..0506b54 100644 --- a/selfdrive/oscarpilot/settings/settings.cc +++ b/selfdrive/oscarpilot/settings/settings.cc @@ -24,10 +24,10 @@ #include "selfdrive/ui/qt/util.h" #include "selfdrive/ui/qt/qt_window.h" -#include "selfdrive/frogpilot/navigation/ui/navigation_settings.h" -#include "selfdrive/frogpilot/ui/control_settings.h" +// #include "selfdrive/frogpilot/navigation/ui/navigation_settings.h" +// #include "selfdrive/frogpilot/ui/control_settings.h" #include "selfdrive/frogpilot/ui/vehicle_settings.h" -#include "selfdrive/frogpilot/ui/visual_settings.h" +// #include "selfdrive/frogpilot/ui/visual_settings.h" #include "selfdrive/oscarpilot/settings/settings.h" @@ -81,11 +81,16 @@ OscarSettingsWindow::OscarSettingsWindow(QWidget *parent) : QFrame(parent) { // QObject::connect(device, &DevicePanel::showDriverView, this, &SettingsWindow::showDriverView); + DevicePanel *device = new DevicePanel(this); + QObject::connect(device, &DevicePanel::reviewTrainingGuide, this, &SettingsWindow::reviewTrainingGuide); + QObject::connect(device, &DevicePanel::showDriverView, this, &SettingsWindow::showDriverView); + QList> panels = { // {tr("Basic"), basic}, + // {tr("Software"), new SoftwarePanel(this)}, // {tr("Advanced"), basic}, // {tr("Logging"), basic}, // Log / Upload driver cam, Routes - // {tr("System"), basic}, // Debugging + {tr("System"), new FrogPilotVehiclesPanel(this)}, // Debugging // {tr("Status"), basic}, // Report on stuff like connectivity, free space, detected features // {tr("Extra"), basic}, // Custom cloud services, QOL automations };