This commit is contained in:
concordia
2024-03-01 22:44:45 -06:00
parent 9de0c5484c
commit 5081a5d670

View File

@@ -24,10 +24,10 @@
#include "selfdrive/ui/qt/util.h" #include "selfdrive/ui/qt/util.h"
#include "selfdrive/ui/qt/qt_window.h" #include "selfdrive/ui/qt/qt_window.h"
// #include "selfdrive/frogpilot/navigation/ui/navigation_settings.h" #include "selfdrive/frogpilot/navigation/ui/navigation_settings.h"
// #include "selfdrive/frogpilot/ui/control_settings.h" #include "selfdrive/frogpilot/ui/control_settings.h"
#include "selfdrive/oscarpilot/settings/basic.h" #include "selfdrive/oscarpilot/settings/basic.h"
// #include "selfdrive/frogpilot/ui/visual_settings.h" #include "selfdrive/frogpilot/ui/visual_settings.h"
#include "selfdrive/oscarpilot/settings/settings.h" #include "selfdrive/oscarpilot/settings/settings.h"
@@ -85,8 +85,10 @@ OscarSettingsWindow::OscarSettingsWindow(QWidget *parent) : QFrame(parent) {
QList<QPair<QString, QWidget *>> panels = { QList<QPair<QString, QWidget *>> panels = {
{tr("Basic"), new OscarPilotBasicPanel(this)}, {tr("Basic"), new OscarPilotBasicPanel(this)},
{tr("Network"), new Networking(this)},
{tr("Advanced"), frogpilotControls}, {tr("Advanced"), frogpilotControls},
{tr("Network"), new Networking(this)},
{tr("Software"), new SoftwarePanel(this)},
FrogPilotControlsPanel
// {tr("OscarCloud"), basic}, // {tr("OscarCloud"), basic},
// {tr("Logging"), basic}, // Log / Upload driver cam, Routes // {tr("Logging"), basic}, // Log / Upload driver cam, Routes
// {tr("System"), new OscarPilotBasicPanel(this)}, // Debugging // {tr("System"), new OscarPilotBasicPanel(this)}, // Debugging