v3.5.1 - merge with patch

v3.4.4 Fix for new installations with filesystem not initializing

.gitignore

@@ -1,5 +1,7 @@
 # vscode
 .vscode
+.directory
+workspace.code-workspace
 
 # build
 build/

CHANGELOG.md

@@ -5,6 +5,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# [3.5.1] March 11 2023
+
+## Added
+
+- Detect old Tado thermostat, device-id 0x19, no entities
+- Some more HM200 entities [#500](https://github.com/emsesp/EMS-ESP32/issues/500)
+- Add entity to force heating off (for systems without thermostat) [#951](https://github.com/emsesp/EMS-ESP32/issues/951)
+
+## Fixed
+
+- HA-discovery for analog sensor commands [#1035](https://github.com/emsesp/EMS-ESP32/issues/1035)
+
+## Changed
+
+- Use byte 0 for detection RC30 active heatingcircuit [#786](https://github.com/emsesp/EMS-ESP32/issues/786)
+- Write repeated selflowtemp if tx-queue is empty without verify [#954](https://github.com/emsesp/EMS-ESP32/issues/954)
+- HA discovery recreate after disconnect by device [#1067](https://github.com/emsesp/EMS-ESP32/issues/1067)
+- File upload: check flash size (overflow) instead of filesize
+
+
 # [3.5.0] February 6 2023
 
 ## **IMPORTANT! BREAKING CHANGES**
@@ -103,10 +123,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Changed
 
-- Controller data in web-ui only for IVT [#522](https://github.com/emsesp/EMS-ESP32/issues/522)
-- Rename hidden `climate` to a more explaining name [#523](https://github.com/emsesp/EMS-ESP32/issues/523)
-- Minor changes to the Customizations web page [#527](https://github.com/emsesp/EMS-ESP32/pull/527)
-
 # [3.4.0] May 23 2022
 
 ## Added

CHANGELOG_LATEST.md

@@ -1,20 +1,2 @@
 # Changelog
 
-# [3.5.1]
-
-## Added
-
-- Detect old Tado thermostat, device-id 0x19, no entities
-- Some more HM200 entities [#500](https://github.com/emsesp/EMS-ESP32/issues/500)
-- Add entity to force heating off (for systems without thermostat) [#951](https://github.com/emsesp/EMS-ESP32/issues/951)
-
-## Fixed
-
-- HA-discovery for analog sensor commands [#1035](https://github.com/emsesp/EMS-ESP32/issues/1035)
-
-## Changed
-
-- Use byte 0 for detection RC30 active heatingcircuit [#786](https://github.com/emsesp/EMS-ESP32/issues/786)
-- Write repeated selflowtemp if tx-queue is empty without verify [#954](https://github.com/emsesp/EMS-ESP32/issues/954)
-- HA discovery recreate after disconnect by device [#1067](https://github.com/emsesp/EMS-ESP32/issues/1067)
-- File upload: check flash size (overflow) instead of filesize

interface/.typesafe-i18n.json

@@ -1,5 +1,5 @@
 {
    "adapter": "react",
    "baseLocale": "pl",
-   "$schema": "https://unpkg.com/typesafe-i18n@5.24.1/schema/typesafe-i18n.json"
+   "$schema": "https://unpkg.com/typesafe-i18n@5.24.2/schema/typesafe-i18n.json"
 }

interface/package.json

@@ -4,19 +4,19 @@
   "private": true,
   "proxy": "http://localhost:3080",
   "dependencies": {
-    "@emotion/react": "^11.10.6",
-    "@emotion/styled": "^11.10.6",
+    "@emotion/react": "^11.10.5",
+    "@emotion/styled": "^11.10.5",
     "@msgpack/msgpack": "^2.8.0",
-    "@mui/icons-material": "^5.11.9",
-    "@mui/material": "^5.11.10",
-    "@table-library/react-table-library": "4.0.26",
+    "@mui/icons-material": "^5.11.0",
+    "@mui/material": "^5.11.7",
+    "@table-library/react-table-library": "4.0.24",
     "@types/lodash": "^4.14.191",
-    "@types/node": "^18.14.0",
-    "@types/react": "^18.0.28",
-    "@types/react-dom": "^18.0.11",
+    "@types/node": "^18.11.19",
+    "@types/react": "^18.0.27",
+    "@types/react-dom": "^18.0.10",
     "@types/react-router-dom": "^5.3.3",
     "async-validator": "^4.2.5",
-    "axios": "^1.3.4",
+    "axios": "^1.3.2",
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
     "notistack": "^2.0.8",
@@ -28,7 +28,7 @@
     "react-router-dom": "^6.8.1",
     "react-scripts": "5.0.1",
     "sockette": "^2.0.6",
-    "typesafe-i18n": "^5.24.1",
+    "typesafe-i18n": "^5.24.0",
     "typescript": "^4.9.5"
   },
   "scripts": {

lib/framework/UploadFileService.cpp

@@ -71,7 +71,7 @@ void UploadFileService::handleUpload(AsyncWebServerRequest * request, const Stri
                 return;
             }
 #elif CONFIG_IDF_TARGET_ESP32S3
-            if (len > 12 && (data[0] != 0xE9 || data[12] != 9)) {
+            if (len > 12 && (data[0] != 0xE9 || data[12] != 3)) {
                 handleError(request, 503); // service unavailable
                 return;
             }

mock-api/package-lock.json

@@ -13,8 +13,8 @@
                 "compression": "^1.7.4",
                 "express": "^4.18.2",
                 "express-sse": "^0.5.3",
-                "nodemon": "^2.0.20",
-                "ws": "^8.12.1"
+                "nodemon": "^2.0.21",
+                "ws": "^8.13.0"
             }
         },
         "node_modules/@msgpack/msgpack": {
@@ -643,9 +643,9 @@
             }
         },
         "node_modules/nodemon": {
-            "version": "2.0.20",
-            "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz",
-            "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==",
+            "version": "2.0.21",
+            "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.21.tgz",
+            "integrity": "sha512-djN/n2549DUtY33S7o1djRCd7dEm0kBnj9c7S9XVXqRUbuggN1MZH/Nqa+5RFQr63Fbefq37nFXAE9VU86yL1A==",
             "dependencies": {
                 "chokidar": "^3.5.2",
                 "debug": "^3.2.7",
@@ -1015,9 +1015,9 @@
             }
         },
         "node_modules/ws": {
-            "version": "8.12.1",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz",
-            "integrity": "sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==",
+            "version": "8.13.0",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+            "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
             "engines": {
                 "node": ">=10.0.0"
             },

mock-api/package.json

@@ -15,7 +15,7 @@
         "compression": "^1.7.4",
         "express": "^4.18.2",
         "express-sse": "^0.5.3",
-        "nodemon": "^2.0.20",
-        "ws": "^8.12.1"
+        "nodemon": "^2.0.21",
+        "ws": "^8.13.0"
     }
 }

src/dallassensor.cpp

@@ -637,4 +637,4 @@ void DallasSensor::test() {
 }
 #endif
 
-} // namespace emsesp
+} // namespace emsesp

src/device_library.h

@@ -48,7 +48,6 @@
 {208, DeviceType::BOILER, "Logamax Plus/GB192/Condens GC9000/Greenstar ErP", DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {210, DeviceType::BOILER, "Cascade MC400", DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {211, DeviceType::BOILER, "EasyControl Adapter", DeviceFlags::EMS_DEVICE_FLAG_NONE},
-{219, DeviceType::BOILER, "Greenstar HIU", DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {234, DeviceType::BOILER, "Logamax Plus GB122/Condense 2300", DeviceFlags::EMS_DEVICE_FLAG_NONE},
 
 // Controllers - 0x09 / 0x10 / 0x50

src/locale_common.h

@@ -291,7 +291,7 @@ MAKE_PSTR_ENUM(enum_modetype5, FL_(off), FL_(on))
 
 MAKE_PSTR_ENUM(enum_reducemode, FL_(nofrost), FL_(reduce), FL_(room), FL_(outdoor))
 MAKE_PSTR_ENUM(enum_reducemode1, FL_(outdoor), FL_(room), FL_(reduce)) // RC310 values: 1-3
-MAKE_PSTR_ENUM(enum_nofrostmode, FL_(off), FL_(outdoor), FL_(room))
+MAKE_PSTR_ENUM(enum_nofrostmode, FL_(off), FL_(room), FL_(outdoor))
 MAKE_PSTR_ENUM(enum_nofrostmode1, FL_(room), FL_(outdoor), FL_(room_outdoor))
 
 MAKE_PSTR_ENUM(enum_controlmode, FL_(off), FL_(optimized), FL_(simple), FL_(mpc), FL_(room), FL_(power), FL_(constant))

src/mqtt.cpp

@@ -815,8 +815,8 @@ void Mqtt::process_queue() {
 #if defined(EMSESP_DEBUG)
         LOG_DEBUG("[DEBUG] Waiting for QOS-ACK");
 #endif
-        // if we don't get the ack within 10 seconds, republish with new packet_id
-        if (uuid::get_uptime_sec() - last_publish_queue_ < 10) {
+        // if we don't get the ack within 10 minutes, republish with new packet_id
+        if (uuid::get_uptime_sec() - last_publish_queue_ < 600) {
             return;
         }
     }

src/system.cpp

@@ -659,6 +659,7 @@ void System::network_init(bool refresh) {
     }
 
     last_system_check_ = 0; // force the LED to go from fast flash to pulse
+    send_heartbeat();
 
     if (phy_type_ == PHY_type::PHY_TYPE_NONE) {
         return;
@@ -714,6 +715,7 @@ void System::system_check() {
                     digitalWrite(led_gpio_, hide_led_ ? !LED_ON : LED_ON);
 #endif
                 }
+                send_heartbeat();
             } else {
                 // turn off LED so we're ready to the flashes
                 if (led_gpio_) {

src/version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.5.2-patch.0"
+#define EMSESP_APP_VERSION "3.5.1"

src/web/WebSettingsService.cpp

@@ -247,27 +247,20 @@ StateUpdateResult WebSettings::update(JsonObject & root, WebSettings & settings)
     prev                 = settings.bool_format;
     settings.bool_format = root["bool_format"] | EMSESP_DEFAULT_BOOL_FORMAT;
     EMSESP::system_.bool_format(settings.bool_format);
-    if (Mqtt::ha_enabled()) {
+    if (Mqtt::ha_enabled())
         check_flag(prev, settings.bool_format, ChangeFlags::MQTT);
-    }
 
     prev                 = settings.enum_format;
     settings.enum_format = root["enum_format"] | EMSESP_DEFAULT_ENUM_FORMAT;
     EMSESP::system_.enum_format(settings.enum_format);
-    if (Mqtt::ha_enabled()) {
+    if (Mqtt::ha_enabled())
         check_flag(prev, settings.enum_format, ChangeFlags::MQTT);
-    }
-
-    String old_locale = settings.locale;
-    settings.locale   = root["locale"] | EMSESP_DEFAULT_LOCALE;
-    EMSESP::system_.locale(settings.locale);
-    if (Mqtt::ha_enabled() && !old_locale.equals(settings.locale)) {
-        add_flags(ChangeFlags::MQTT);
-    }
 
     //
     // without checks or necessary restarts...
     //
+    settings.locale = root["locale"] | EMSESP_DEFAULT_LOCALE;
+    EMSESP::system_.locale(settings.locale);
 
     settings.trace_raw = root["trace_raw"] | EMSESP_DEFAULT_TRACELOG_RAW;
     EMSESP::trace_raw(settings.trace_raw);