Fixed standard WebUI

shining-man · Jan 11, 2024 · 4b25b0a · 4b25b0a
1 parent 812ddbf
commit 4b25b0a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/include/WebSettings.h b/include/WebSettings.h
@@ -92,6 +92,18 @@ class WebSettings {
   static void     getIdFromParamId(uint16_t paramId, uint16_t &id, uint8_t &groupIdx);
 
 private:
+  const char *parameterFile;
+  String   str_mConfName;
+  String   str_mConfigfile;
+  uint8_t  u8_mJsonArraySize;
+  String   str_mAjaxGetDataTimerHandlerName;
+  uint16_t u16_mAjaxGetDataTimerSec;
+
+  uint8_t  u8_mButtons = 0;
+  String   str_mButton1Text;
+  String   str_mButton2Text;
+  String   str_mButton3Text;
+
   //Parameterfile
   boolean readConfig();
 

diff --git a/include/defines.h b/include/defines.h
@@ -8,7 +8,7 @@
 
 #include "params_dt.h"
 
-#define BSC_SW_VERSION      "V0.5.3"
+#define BSC_SW_VERSION      "V0.5.4"
 
 static const char COMPILE_DATE_TIME[] = "";
 

diff --git a/lib_precompiled/libwebapp2.a b/lib_precompiled/libwebapp2.a
diff --git a/lib_precompiled/libwebapp2_serial_log.a b/lib_precompiled/libwebapp2_serial_log.a
diff --git a/src/WebSettings.cpp b/src/WebSettings.cpp
@@ -36,19 +36,6 @@ static sparse_hash_map<uint16_t, bool> settingValues_bo;
 static sparse_hash_map<uint16_t, std::string> settingValues_str;
 
 
-const char *parameterFile;
-String   str_mConfName;
-String   str_mConfigfile;
-uint8_t  u8_mJsonArraySize;
-String   str_mAjaxGetDataTimerHandlerName;
-uint16_t u16_mAjaxGetDataTimerSec;
-
-uint8_t  u8_mButtons = 0;
-String   str_mButton1Text;
-String   str_mButton2Text;
-String   str_mButton3Text;
-
-
 static char _buf[2000];
 static String st_mSendBuf = "";
 static String str_lTmpGetString;