V 4.67

InnuendoPi · Feb 11, 2025 · 86057ad · 86057ad
1 parent ccb826e
commit 86057ad
Show file tree

Hide file tree

Showing 11 changed files with 420 additions and 340 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ libraries
 ld_h
 arduino.ar
 build.options.json
+compile_result.json
 MQTTDevice4.ino.elf
 MQTTDevice4.ino.map
 includes.cache

diff --git a/5_DISPLAY.ino b/5_DISPLAY.ino
@@ -452,7 +452,9 @@ void cbpi4steps_handlemqtt(unsigned char *payload)
       if (activePage == 1)
         nextion.writeStr(p1current_text, currentStepName);
     }
-    if (doc["state_text"] != 0 && doc["state_text"] != "Waiting for Target Temp")
+    // 
+    // if (doc["state_text"] != 0 && doc["state_text"] != "Waiting for Target Temp")
+    if (doc["state_text"].as<int>() != 0 && doc["state_text"] != "Waiting for Target Temp")
     {
       strlcpy(currentStepRemain, doc["state_text"] | "", maxRemainSign);
       if (activePage == 0)

diff --git a/7_WEB.ino b/7_WEB.ino
@@ -298,6 +298,7 @@ void handleSetMisc()
   if (doc["reset"] && doc["clear"])
   {
     LittleFS.remove(CONFIG);
+    LittleFS.remove(LOG_CFG);
     WiFi.disconnect();
     wifiManager.resetSettings();
     delay(PAUSE1SEC);
@@ -313,6 +314,7 @@ void handleSetMisc()
   if (doc["clear"])
   {
     LittleFS.remove(CONFIG);
+    LittleFS.remove(LOG_CFG);
     EM_REBOOT();
   }
 
@@ -347,7 +349,7 @@ void handleSetMisc()
   setTagLevel("ACT", doc["logAct"]);
   setTagLevel("IND", doc["logInd"]);
   setTagLevel("SYS", doc["logSys"]);
-  if (doc["logDis"] > 0)
+  if (doc["logDis"].as<int>() > 0)
   {
     setTagLevel("DIS", 3);
     nextion.setDebug(true);

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,8 @@
 # Changelog
 
-Version 4.66
-
-- merge:      merge development branch into new release 4.66
-
-Version 4.65.4
+Version 4.67
 
+- Fix:        LittleFS image broken, after upgrade mklittlefs. downgrade mklittlefs 3.2.0 (littlefs version)
 - new:        norwegian language file added - thank you for supporting this projekt @ user oyvind
 - changed:    DS18B20 sensors error handling
 - Fix:        DS18B20 sensors address search (ESP8266)

diff --git a/MQTTDevice.h b/MQTTDevice.h
@@ -1,5 +1,5 @@
 // Version
-#define Version "4.66"
+#define Version "4.67"
 
 // Definiere Pausen
 #define PAUSE1SEC 1000

diff --git a/README.md b/README.md
@@ -37,16 +37,20 @@ MQTTDevice4 ist ein Arduino Sketch für Wemos ESP8266 D1 mini Module. Mit dem MQ
 * Dateiexplorer
 * Unterstützung für versch. Sprachen
 
-## 🗺️ Changelog Version 4.65
+## 🗺️ Changelog Version 4.67
 
 ESP8266 Arduino 3.2\
-VSCode 1.95 Arduino 0.7 Arduino CLI 1.0.4\
+VSCode 1.97 Arduino 0.7 Arduino CLI 1.1.1\
 VSCode plugin ESP8266LittleFS based on ESP8266fs\
 InnuTicker task scheduler lib\
 InnuNextion Display lib based on EasyNext\
 InnuFramework CSS/JS bootstrap 4.6.2\
 Server Sent Events (6 SSE channels)
 
+* Fix:        LittleFS image broken, after upgrade mklittlefs. downgrade mklittlefs 3.2.0 (littlefs version)
+* Update:     ArduinoJSON 7.3
+* Update:     Dallas Temperature 4.0.4
+* Fix:        ArduinoJSON type err
 * new:        add norwegian language file - thank you for supporting this projekt @ user oyvind
 * changed:    DS18B20 sensors error handling
 * Fix:        DS18B20 sensors address search (ESP8266)
@@ -71,7 +75,7 @@ Server Sent Events (6 SSE channels)
 
 ## 💻 Installation
 
-* Download [Firmeware.zip](https://github.com/InnuendoPi/MQTTDevice4/blob/main/tools/Firmware.zip)
+* Download [Firmware.zip](https://github.com/InnuendoPi/MQTTDevice4/blob/main/tools/Firmware.zip)
 * Firmware.zip entpacken
 * Flashen.cmd editieren:
 * "COM3" in Zeile 6  und Zeile 8"esptool.exe *p COM3" anpassen
@@ -106,11 +110,11 @@ _Unterstützte das Projekt und übersetze das MQTTDevice in eine neue Sprache bz
 
 ## 📰 Sketch Information
 
-Libraries: Version 4.58, 12.2023
+Libraries: Version 4.67, 02.2025
 
 * ESP8266 3.1.2
 * Arduino IDE 1.8.19
-* VSCode 1.85 Arduino-CLI ESP8266FS Plugin (modifiziert für LittleFS)
+* VSCode 1.97 Arduino-CLI ESPFS
 * OneWire
 * DallasTemperature
 * PubSubClient

diff --git a/build/MQTTDevice4.ino.bin b/build/MQTTDevice4.ino.bin
diff --git a/build/MQTTDevice4.mklittlefs.bin b/build/MQTTDevice4.mklittlefs.bin
diff --git a/build/compile_commands.json b/build/compile_commands.json
diff --git a/index_htm.h b/index_htm.h
@@ -1,5 +1,5 @@
 const char index_htm_gz[] PROGMEM = { 
-  0x1f, 0x8b, 0x08, 0x08, 0xbf, 0x3b, 0x37, 0x67, 0x04, 0x00, 0x69, 0x6e,
+  0x1f, 0x8b, 0x08, 0x08, 0xb8, 0xf8, 0xaa, 0x67, 0x04, 0x00, 0x69, 0x6e,
   0x64, 0x65, 0x78, 0x2e, 0x68, 0x74, 0x6d, 0x00, 0xed, 0x5d, 0xfd, 0x5a,
   0xf3, 0x34, 0x14, 0xbf, 0x95, 0x5a, 0x15, 0x36, 0xdd, 0x06, 0x1b, 0x2f,
   0x3e, 0x3a, 0x28, 0x3c, 0x08, 0x53, 0x51, 0x04, 0x64, 0xf3, 0xfb, 0x03,

diff --git a/tools/MQTTDevice4.mklittlefs.bin b/tools/MQTTDevice4.mklittlefs.bin