Merge pull request #46 from GregAscolab/asl

Missing mandatory "dhcp" option + Wrong logical test !!!
cotestatnt · Sep 8, 2024 · c7a3592 · c7a3592
2 parents 8a1e732 + 19260f4
commit c7a3592
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/AsyncFsWebServer.cpp b/src/AsyncFsWebServer.cpp
@@ -13,7 +13,7 @@ bool AsyncFsWebServer::init(AwsEventHandler wsHandle) {
     file = m_filesystem->open(ESP_FS_WS_CONFIG_FILE, "r");
     if (!file) {
         file = m_filesystem->open(ESP_FS_WS_CONFIG_FILE, "w");
-        file.print("{\"wifi-box\": \"\"}");
+        file.print("{\"wifi-box\": \"\",\n\t\"dhcp\": false}");
         file.close();
     } else
         file.close();

diff --git a/src/SetupConfig.hpp b/src/SetupConfig.hpp
@@ -30,7 +30,7 @@ class SetupConfigurator
                     log_error("Error. File %s not created", ESP_FS_WS_CONFIG_FILE);
                     return false;
                 }
-                file.print("{\"wifi-box\": \"\"}");
+                file.print("{\"wifi-box\": \"\",\"dhcp\":false}");
                 file.close();
             }
             return true;
@@ -231,7 +231,7 @@ class SetupConfigurator
                 key += numOptions ;
 
             // If key is present and value is the same, we don't need to create/update it.
-            if (doc.containsKey(key.c_str()) && doc[key] != val)
+            if (doc.containsKey(key.c_str()) && doc[key] == val)
                 return;
 
             // if min, max, step != from default, treat this as object in order to set other properties