From cc0a23802f3924aa7a1417cda79c698ada07e5aa Mon Sep 17 00:00:00 2001
From: CommanderRedYT <ccommanderred@gmail.com>
Date: Wed, 8 Dec 2021 22:50:30 +0100
Subject: [PATCH] Added new parameter and fixed ifdef

---
 main/presets.cpp      | 9 ++++++++-
 main/stringsettings.h | 6 +++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/main/presets.cpp b/main/presets.cpp
index 14a16fb..17e1055 100644
--- a/main/presets.cpp
+++ b/main/presets.cpp
@@ -50,8 +50,15 @@ StringSettings makeDefaultStringSettings()
         },
         .otaServerUrl = {},
 #endif
+#ifdef AP_PASSWORD
         .ap_password = STRING(AP_PASSWORD),
-        .otaServerBranch = {}
+#else
+        .ap_password = "Bobbycar_123",
+#endif
+#ifdef FEATURE_OTA
+        .otaServerBranch = {},
+#endif
+        .webserver_password = STRING(AP_PASSWORD),
     };
 }
 } // namespace presets
diff --git a/main/stringsettings.h b/main/stringsettings.h
index 406bcab..18755ca 100644
--- a/main/stringsettings.h
+++ b/main/stringsettings.h
@@ -49,7 +49,10 @@ struct StringSettings
     std::string dns_key;
 #endif
     std::string ap_password;
+#ifdef FEATURE_OTA
     std::string otaServerBranch;
+#endif
+    std::string webserver_password;
 };
 
 template<typename T>
@@ -114,12 +117,13 @@ void StringSettings::executeForEveryCommonSetting(T &&callable)
 //    callable("otaUrl9",     otaServers[9].url);
 
     callable("otaserver", otaServerUrl);
+    callable("otaBranch", otaServerBranch);
 #endif
 #ifdef FEATURE_DNS_NS
     callable("dnskey", dns_key);
 #endif
     callable("ap_pw", ap_password);
-    callable("otaBranch", otaServerBranch);
+    callable("webpw", webserver_password);
 }
 
 template<typename T>