From 5081a5d670f0c3dc3481e8cae8ce5338b036f3f7 Mon Sep 17 00:00:00 2001
From: concordia <concordia>
Date: Fri, 1 Mar 2024 22:44:45 -0600
Subject: [PATCH] wip

---
 selfdrive/oscarpilot/settings/settings.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/selfdrive/oscarpilot/settings/settings.cc b/selfdrive/oscarpilot/settings/settings.cc
index 6344d2d..91cf9ab 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/oscarpilot/settings/basic.h"
-// #include "selfdrive/frogpilot/ui/visual_settings.h"
+#include "selfdrive/frogpilot/ui/visual_settings.h"
 
 #include "selfdrive/oscarpilot/settings/settings.h"
 
@@ -85,8 +85,10 @@ OscarSettingsWindow::OscarSettingsWindow(QWidget *parent) : QFrame(parent) {
 
   QList<QPair<QString, QWidget *>> panels = {
     {tr("Basic"), new OscarPilotBasicPanel(this)},
-    {tr("Network"), new Networking(this)},
     {tr("Advanced"), frogpilotControls},
+    {tr("Network"), new Networking(this)},
+    {tr("Software"), new SoftwarePanel(this)},
+    FrogPilotControlsPanel
     // {tr("OscarCloud"), basic},
     // {tr("Logging"), basic},  // Log / Upload driver cam, Routes
     // {tr("System"), new OscarPilotBasicPanel(this)},   // Debugging