From b2b9f97dce6f1d5c263a28a56ac403b026b5faa0 Mon Sep 17 00:00:00 2001
From: CommanderRedYT <ccommanderred@gmail.com>
Date: Mon, 18 Oct 2021 13:35:18 +0200
Subject: [PATCH] Kinda implemented build server selection (does not work)

---
 main/displays/menus/selectbuildservermenu.h | 16 ++++++++++++----
 main/presets.h                              |  8 ++++----
 main/stringsettings.h                       |  6 +++---
 main/texts.h                                |  1 +
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/main/displays/menus/selectbuildservermenu.h b/main/displays/menus/selectbuildservermenu.h
index 45029d2..21cf7fe 100644
--- a/main/displays/menus/selectbuildservermenu.h
+++ b/main/displays/menus/selectbuildservermenu.h
@@ -27,17 +27,25 @@ class SelectBuildServerMenu :
 public:
     SelectBuildServerMenu() {
 
-        /*
+        auto numDisplayedServers = 0;
+
         for (auto index = 0; index < stringSettings.otaServers.size(); index++)
         {
             auto otaServer = stringSettings.otaServers[index];
             std::string url = otaServer.url;
             std::string name = (otaServer.name.empty()) ? url : otaServer.name;
 
-            auto menuitem = constructMenuItem<makeComponent<MenuItem, ChangeableText, DummyAction>>();
-            menuitem.setTitle(name);
+            if (!name.empty()) {
+                auto menuitem = constructMenuItem<makeComponent<MenuItem, ChangeableText, DummyAction>>();
+                menuitem.setTitle(name);
+                numDisplayedServers++;
+            }
+        }
+
+        if (!numDisplayedServers)
+        {
+            constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_NOBUILDSERVERCONFIGURED>, DummyAction>>();
         }
-        */
 
         constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<SettingsMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
     }
diff --git a/main/presets.h b/main/presets.h
index f784078..afcfa1c 100644
--- a/main/presets.h
+++ b/main/presets.h
@@ -325,10 +325,9 @@ StringSettings makeDefaultStringSettings()
         .timeServer = "europe.pool.ntp.org",
 #endif
 #ifdef FEATURE_OTA
-        .otaServers = std::array<ConfiguredOtaServer, 10> {
-            ConfiguredOtaServer { .name = {}, .url = {} },
-            ConfiguredOtaServer { .name = {}, .url = {} },
-            ConfiguredOtaServer { .name = {}, .url = {} },
+        .otaServers = std::array<ConfiguredOtaServer, 2> {
+            ConfiguredOtaServer { .name = {}, .url = {} },
+            ConfiguredOtaServer { .name = {}, .url = {} },/*
             ConfiguredOtaServer { .name = {}, .url = {} },
             ConfiguredOtaServer { .name = {}, .url = {} },
             ConfiguredOtaServer { .name = {}, .url = {} },
@@ -336,6 +335,7 @@ StringSettings makeDefaultStringSettings()
             ConfiguredOtaServer { .name = {}, .url = {} },
             ConfiguredOtaServer { .name = {}, .url = {} },
             ConfiguredOtaServer { .name = {}, .url = {} },
+            ConfiguredOtaServer { .name = {}, .url = {} },*/
         },
 #endif
     };
diff --git a/main/stringsettings.h b/main/stringsettings.h
index 3dd1300..835c890 100644
--- a/main/stringsettings.h
+++ b/main/stringsettings.h
@@ -43,7 +43,7 @@ struct StringSettings
         std::string url;
     };
 
-    std::array<ConfiguredOtaServer, 10> otaServers;
+    std::array<ConfiguredOtaServer, 2> otaServers;
 #endif
 };
 
@@ -89,7 +89,7 @@ void StringSettings::executeForEveryCommonSetting(T &&callable)
     callable("otaName0",    otaServers[0].name);
     callable("otaUrl0",     otaServers[0].url);
     callable("otaName1",    otaServers[1].name);
-    callable("otaUrl1",     otaServers[1].url);
+    callable("otaUrl1",     otaServers[1].url);/*
     callable("otaName2",    otaServers[2].name);
     callable("otaUrl2",     otaServers[2].url);
     callable("otaName3",    otaServers[3].name);
@@ -105,7 +105,7 @@ void StringSettings::executeForEveryCommonSetting(T &&callable)
     callable("otaName8",    otaServers[8].name);
     callable("otaUrl8",     otaServers[8].url);
     callable("otaName9",    otaServers[9].name);
-    callable("otaUrl9",     otaServers[9].url);
+    callable("otaUrl9",     otaServers[9].url);*/
 #endif
 }
 
diff --git a/main/texts.h b/main/texts.h
index e039300..6ad8451 100644
--- a/main/texts.h
+++ b/main/texts.h
@@ -473,6 +473,7 @@ constexpr char TEXT_CRASH_DIVZERO[] = "42 / 0";
 
 //SelectBuildServerMenu
 constexpr char TEXT_SELECTBUILDSERVERMENU[] = "Select Buildserver";
+constexpr char TEXT_NOBUILDSERVERCONFIGURED[] = "Not configured";
 
 #ifdef FEATURE_CAN
 constexpr char TEXT_POWERSUPPLY[] = "Powersupply";