v2.6

Author: s60sc

globals.h

@@ -10,7 +10,9 @@
 
 #pragma once
 
-//#define DEV_ONLY // leave commented out
+#if __has_include("./devUtilities.cpp") 
+//#define DEV_ONLY 
+#endif
 #ifdef DEV_ONLY
 // to compile with -Wall -Werror=all -Wextra
 #pragma GCC diagnostic error "-Wformat=2"
@@ -200,6 +202,7 @@ bool startStorage();
 bool startWebServer();
 void stopPing();
 void syncToBrowser(uint32_t browserUTC);
+char* toCase(char *s, bool toLower = true);
 char* trim(char* str);
 bool updateConfigVect(const char* variable, const char* value);
 void updateStatus(const char* variable, const char* _value, bool fromUser = true);
@@ -339,8 +342,7 @@ extern char messageLog[];
 extern uint16_t mlogEnd;
 extern bool timeSynchronized;
 extern bool monitorOpen; 
-extern const uint8_t setupPage_html_gz[];
-extern const size_t setupPage_html_gz_len;
+extern const char* setupPage_html;
 extern const char* otaPage_html;
 extern const char* failPageS_html;
 extern const char* failPageE_html;

prefs.cpp

@@ -131,6 +131,7 @@ static void loadVectItem(const std::string keyValGrpLabel) {
 static void saveConfigVect() {
   File file = STORAGE.open(CONFIG_FILE_PATH, FILE_WRITE);
   char configLine[FILE_NAME_LEN + 101];
+  int cfgCnt = 0;
   if (!file) LOG_WRN("Failed to save to configs file");
   else {
     sort(configs.begin(), configs.end());
@@ -142,8 +143,9 @@ static void saveConfigVect() {
         snprintf(configLine, FILE_NAME_LEN + 100, "%s%c%.*s%c%s%c%s%c%s\n", row[0].c_str(), DELIM, strlen(row[1].c_str()), FILLSTAR, DELIM, row[2].c_str(), DELIM, row[3].c_str(), DELIM, row[4].c_str());
       else snprintf(configLine, FILE_NAME_LEN + 100, "%s%c%s%c%s%c%s%c%s\n", row[0].c_str(), DELIM, row[1].c_str(), DELIM, row[2].c_str(), DELIM, row[3].c_str(), DELIM, row[4].c_str());
       file.write((uint8_t*)configLine, strlen(configLine));
+      cfgCnt++;
     }
-    LOG_ALT("Config file saved");
+    LOG_ALT("Config file saved %d entries", cfgCnt);
   }
   file.close();
 }
@@ -485,7 +487,14 @@ static bool checkConfigFile() {
     file = STORAGE.open(CONFIG_FILE_PATH, FILE_WRITE);
     if (file) {
       // apply initial defaults
-      file.write((uint8_t*)appConfig, strlen(appConfig));
+      uint8_t* p = (uint8_t*)appConfig;
+      int cfgLen = strlen(appConfig);
+      while (cfgLen > 0) {
+        int toWrite = min(512, cfgLen);
+        file.write(p, toWrite);
+        p += toWrite;
+        cfgLen -= toWrite;
+      }
       sprintf(hostName, "%s_%012llX", APP_NAME, ESP.getEfuseMac());
       char cfg[100];
       sprintf(cfg, "appId~%s~99~~na\n", APP_NAME);