Merge pull request #3031 from proddy/core3

build_webUI -> build-webUI

.github/ISSUE_TEMPLATE/bug_report.md

@@ -22,7 +22,7 @@ _Make sure your have performed every step and checked the applicable boxes befor
 - [ ] Searched the issue in [issues](https://github.com/emsesp/EMS-ESP32/issues)
 - [ ] Searched the issue in [discussions](https://github.com/emsesp/EMS-ESP32/discussions)
 - [ ] Searched the issue in the [docs](https://emsesp.org/Troubleshooting/)
-- [ ] Searched the issue in the [chat](https://discord.gg/3J3GgnzpyT)
+- [ ] Searched the issue in the [chat](https://discord.gg/GP9DPSgeJq)
 - [ ] Provide the System information in the area below, taken from `http://<IP>/api/system`
 
 ```json

.github/ISSUE_TEMPLATE/config.yml

@@ -7,5 +7,5 @@ contact_links:
     url: https://github.com/emsesp/EMS-ESP32/discussions
     about: EMS-ESP usage Questions, Feature Requests and Projects.
   - name: EMS-ESP Users Chat
-    url: https://discord.gg/3J3GgnzpyT
+    url: https://discord.gg/GP9DPSgeJq
     about: Chat for feedback, questions and troubleshooting.

.github/workflows/dev_release.yml

@@ -47,7 +47,7 @@ jobs:
 
       - name: Build webUI
         run: |
-          platformio run -e build_webUI
+          platformio run -e build-webUI
 
       - name: Build modbus
         run: |

.github/workflows/stable_release.yml

@@ -39,7 +39,7 @@ jobs:
 
       - name: Build webUI
         run: |
-          platformio run -e build_webUI
+          platformio run -e build-webUI
 
       - name: Build modbus
         run: |

.github/workflows/test_release.yml

@@ -47,7 +47,7 @@ jobs:
 
       - name: Build webUI
         run: |
-          platformio run -e build_webUI
+          platformio run -e build-webUI
 
       - name: Build modbus
         run: |

CHANGELOG.md

@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - board profile `CUSTOM` can only be selected in developer mode
 - mqtt sends round values without decimals (`28` instead of `28.0`)
 
+
 ## [3.8.0] 31 December 2025
 
 ## Added

CHANGELOG_LATEST.md

@@ -6,6 +6,33 @@ For more details go to [emsesp.org](https://emsesp.org/).
 
 ## Added
 
+- comfortpoint for BC400 [#2935](https://github.com/emsesp/EMS-ESP32/issues/2935)
+- customize device brand [#2784](https://github.com/emsesp/EMS-ESP32/issues/2784)
+- set model for ems-esp devices temperature, analog, etc. [#2958](https://github.com/emsesp/EMS-ESP32/discussions/2958)
+- prometheus metrics for temperature/analog/scheduler/custom [#2962](https://github.com/emsesp/EMS-ESP32/issues/2962)
+- boiler pumpkick [#2965](https://github.com/emsesp/EMS-ESP32/discussions/2965)
+- heatpump reset [#2933](https://github.com/emsesp/EMS-ESP32/issues/2933)
+- e-mail notification using ReadyMail Client
+- 2.nd freshwater module (dhw4, dhw5) [#2991](https://github.com/emsesp/EMS-ESP32/issues/2991)
+- full system backup and restore
+
 ## Fixed
 
+- SRC climate creation [#2936](https://github.com/emsesp/EMS-ESP32/issues/2936) and [#2960](https://github.com/emsesp/EMS-ESP32/issues/2960)
+- missing translations [#3015](https://github.com/emsesp/EMS-ESP32/issues/3015)
+
 ## Changed
+
+- weblogbuffer up to 1000 messages with PSRAM, mentioned in [#2933](https://github.com/emsesp/EMS-ESP32/issues/2933)
+- validate custom entity writes, [#2931](https://github.com/emsesp/EMS-ESP32/issues/2931)
+- remove wrong burnMinPower [#2918](https://github.com/emsesp/EMS-ESP32/issues/2918)
+- store scheduler active state to nvs [#2946](https://github.com/emsesp/EMS-ESP32/discussions/2946)
+- translated modes `heat` and `eco` for HA-climate mode-str-tpl
+- support `minflowtemp` and `baseflowtemp` [#2969](https://github.com/emsesp/EMS-ESP32/discussions/2969)
+- update version if it is 00.00 in first read [#2981](https://github.com/emsesp/EMS-ESP32/issues/2981)
+- device class for % values [#2980](https://github.com/emsesp/EMS-ESP32/issues/2980)
+- use tasmota core 2026.03.30
+- secure mqtt uses ESP_SSLClient
+- fetch telegrams: set length to fetch [#3017](https://github.com/emsesp/EMS-ESP32/issues/3017)
+- move http client from stack to heap
+- heap optimizations [#3021](https://github.com/emsesp/EMS-ESP32/discussions/3021)

Makefile

@@ -47,24 +47,25 @@ MAKEFLAGS += -j$(JOBS) -l$(shell echo $$(($(JOBS) * 2)))
 #----------------------------------------------------------------------
 TARGET    := emsesp
 BUILD     := build
-SOURCES   := src/core src/devices src/web src/test lib_standalone lib/semver lib/espMqttClient/src lib/espMqttClient/src/*         lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/PButton 
-INCLUDES  := src/core src/devices src/web src/test lib_standalone lib/* lib/semver lib/espMqttClient/src lib/espMqttClient/src/Transport lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/uuid-telnet/src lib/uuid-syslog/src
+SOURCES   := src/core src/devices src/web src/test lib_standalone       lib/espMqttClient/src lib/espMqttClient/src/*         lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/PButton 
+INCLUDES  := src/core src/devices src/web src/test lib_standalone lib/* lib/espMqttClient/src lib/espMqttClient/src/Transport lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/uuid-telnet/src lib/uuid-syslog/src
 LIBRARIES :=
 
 CPPCHECK = cppcheck
-CHECKFLAGS = -q --force --std=gnu++17
+CHECKFLAGS = -q --force --std=gnu++20
 
 #----------------------------------------------------------------------
 # Languages Standard
 #----------------------------------------------------------------------
-C_STANDARD   := -std=c17
-CXX_STANDARD := -std=gnu++17
+C_STANDARD   := -std=c20
+CXX_STANDARD := -std=gnu++20
 
 #----------------------------------------------------------------------
 # Defined Symbols
 #----------------------------------------------------------------------
 DEFINES += -DARDUINOJSON_ENABLE -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSON_USE_DOUBLE=0 
 DEFINES += -DEMSESP_STANDALONE -DEMSESP_TEST -DEMSESP_DEBUG -DEMC_RX_BUFFER_SIZE=1500
+DEFINES += -DNO_TLS_SUPPORT
 DEFINES += $(ARGS)
 
 DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32S3\"
@@ -79,6 +80,10 @@ SYMBOLS    := $(CURDIR)/$(BUILD)/$(TARGET).out
 CSOURCES   := $(shell find $(SOURCES) -name "*.c" 2>/dev/null)
 CXXSOURCES := $(shell find $(SOURCES) -name "*.cpp" 2>/dev/null)
 
+# Exclude files not needed for standalone build, if they exist
+CSOURCES   := $(filter-out src/core/ModuleLibrary.c,$(CSOURCES))
+CXXSOURCES := $(filter-out src/core/ModuleLibrary.cpp,$(CXXSOURCES))
+
 OBJS       := $(patsubst %,$(BUILD)/%.o,$(basename $(CSOURCES)) $(basename $(CXXSOURCES)))
 DEPS       := $(patsubst %,$(BUILD)/%.d,$(basename $(CSOURCES)) $(basename $(CXXSOURCES)))
 

README.md

@@ -18,7 +18,7 @@
   <a href="https://emsesp.org">
     <img src="https://img.shields.io/badge/Documentation-0077b5?style=for-the-badge&logo=googledocs&logoColor=white" alt="Guides" />
   </a>
-  <a href="https://discord.gg/3J3GgnzpyT">
+  <a href="https://discord.gg/GP9DPSgeJq">
     <img src="https://img.shields.io/badge/Discord-7289da?style=for-the-badge&logo=discord&logoColor=white" alt="Discord" />
   </a>
   <a href="https://github.com/emsesp/EMS-ESP32/blob/main/CHANGELOG.md">
@@ -32,7 +32,8 @@
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=emsesp_EMS-ESP32&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=emsesp_EMS-ESP32)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/9441142f49424ef891e8f5251866ee6b)](https://app.codacy.com/gh/emsesp/EMS-ESP32/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![downloads](https://img.shields.io/github/downloads/emsesp/EMS-ESP32/total.svg)](https://github.com/emsesp/EMS-ESP32/releases)
-[![chat](https://img.shields.io/discord/816637840644505620.svg?style=flat-square&color=blueviolet)](https://discord.gg/3J3GgnzpyT)
+[![chat](https://img.shields.io/discord/816637840644505620.svg?style=flat-square&color=blueviolet)](https://discord.gg/GP9DPSgeJq)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/emsesp/EMS-ESP32)
 
 [![GitHub stars](https://img.shields.io/github/stars/emsesp/EMS-ESP32.svg?style=social&label=Star)](https://github.com/emsesp/EMS-ESP32/stargazers)
 [![GitHub forks](https://img.shields.io/github/forks/emsesp/EMS-ESP32.svg?style=social&label=Fork)](https://github.com/emsesp/EMS-ESP32/network)
@@ -40,7 +41,8 @@
 
 **EMS-ESP** is an open-source firmware for the Espressif ESP32 microcontroller to communicate with **EMS** (Energy Management System) compatible equipment from manufacturers such as Bosch, Buderus, Nefit, Junkers, Worcester, Sieger, elm.leblanc and iVT.
 
-It requires a small circuit to interface with the EMS bus which can be purchased from <https://bbqkees-electronics.nl> or custom built.
+It requires a small circuit to interface with the EMS bus which can be purchased from <https://bbqkees-electronics.nl>. These gateways are tested thoroughly and certified to work with EMS-ESP.
+
 
 ## 📦&nbsp; **Key Features**
 
@@ -64,17 +66,17 @@ Head over to the [Installation Guide](https://emsesp.org/Installing) section of
 
 ## 📋&nbsp; **Documentation**
 
-Visit [emsesp.org](https://emsesp.org) for more details on how to install and configure EMS-ESP. There is also a collection of Frequently Asked Questions and Troubleshooting tips with example customizations from the community.
+Visit [emsesp.org](https://emsesp.org) for more details on how to setup and configure EMS-ESP. You'll also find more a collection of example configuarations, Frequently Asked Questions and Troubleshooting tips.
 
 ## 💬&nbsp; **Getting Support**
 
-To chat with the community reach out on our [Discord Server](https://discord.gg/3J3GgnzpyT).
+To chat with the community reach out on our [Discord Server](https://discord.gg/GP9DPSgeJq).
 
-If you find an issue or have a request, see [how to request support](https://emsesp.org/Support/) on how to submit a bug report or feature request.
+If you find an issue or have a request, see the [Getting Support](https://emsesp.org/Support/) section of the documentation. Note if you are using a non-BBQKees EMS gateway, you may need to contact the manufacturer for support.
 
 ## 🎥&nbsp; **Live Demo**
 
-For a live demo go to [demo.emsesp.org](https://demo.emsesp.org). Pick a language from the sign on page and log in with any username or password. Note not all features are operational as it's based on static data.
+To see a live demo go to [demo.emsesp.org](https://demo.emsesp.org). Pick a language and use any username and password to log in. Note whast you're seeing is static example data so not all features are operational.
 
 ## 💖&nbsp; **Contributors**
 
@@ -84,7 +86,7 @@ If you like **EMS-ESP**, please give it a ✨ on GitHub, or even better fork it
 
 ## 📦&nbsp; **Building**
 
-See the [Building Guide](https://emsesp.org/Building) section of the documentation for instructions on how to build EMS-ESP.
+See the [Building the firmware](https://emsesp.org/Building) guide in the documentation for instructions on how to build EMS-ESP from this source code.
 
 ## 📢&nbsp; **Libraries used**
 

boards/c3_mini_4M.json

@@ -5,7 +5,7 @@
       },
       "core": "esp32",
       "extra_flags": [
-        "-DTASMOTA_SDK",
+        "-DNO_TLS_SUPPORT",
         "-DARDUINO_LOLIN_C3_MINI",
         "-DARDUINO_USB_MODE=1",
         "-DARDUINO_USB_CDC_ON_BOOT=1"

boards/s2_4M_P.json

@@ -6,7 +6,7 @@
       "core": "esp32",
       "extra_flags": [
         "-DBOARD_HAS_PSRAM",
-        "-DTASMOTA_SDK",
+        "-DNO_TLS_SUPPORT",
         "-DARDUINO_USB_CDC_ON_BOOT=1",
         "-DARDUINO_USB_MODE=0"
       ],

boards/s3_32M_P.json

@@ -21,7 +21,7 @@
       "arduino",
       "espidf"
     ],
-    "name": "Espressif ESP32-S3 32M Flash OPI PSRAM, 4608KB Code/OTA, 2MB FS",
+    "name": "Tasmota ESP32-S3 32M Flash OPI PSRAM, 4608KB Code/OTA, 2MB FS",
     "upload": {
       "flash_size": "32MB",
       "maximum_ram_size": 327680,

boards/s_16M.json

@@ -1,7 +1,7 @@
 {
     "build": {
       "core": "esp32",
-      "extra_flags": "-DTASMOTA_SDK",
+      "extra_flags": "-DNO_TLS_SUPPORT",
       "f_cpu": "240000000L",
       "f_flash": "40000000L",
       "flash_mode": "dio",
@@ -19,7 +19,7 @@
       "arduino",
       "espidf"
     ],
-    "name": "Espressif ESP32 16M Flash, 4608KB Code/OTA, 2MB FS",
+    "name": "Tasmota ESP32 16M Flash, 4608KB Code/OTA, 2MB FS",
     "upload": {
       "flash_size": "16MB",
       "maximum_ram_size": 327680,

boards/s_16M_P.json

@@ -19,7 +19,7 @@
       "arduino",
       "espidf"
     ],
-    "name": "Espressif ESP32 16M Flash DIO PSRAM, 4608KB Code/OTA, 2MB FS",
+    "name": "Tasmota ESP32 16M Flash DIO PSRAM, 4608KB Code/OTA, 2MB FS",
     "upload": {
       "flash_size": "16MB",
       "maximum_ram_size": 327680,

boards/s_4M.json

@@ -1,7 +1,7 @@
 {
     "build": {
       "core": "esp32",
-      "extra_flags": "-DTASMOTA_SDK",
+      "extra_flags": "-DNO_TLS_SUPPORT",
       "f_cpu": "240000000L",
       "f_flash": "40000000L",
       "flash_mode": "dio",

boards/seeed_xiao_esp32c6.json

@@ -2,6 +2,7 @@
   "build": {
     "core": "esp32",
     "extra_flags": [
+      "-DNO_TLS_SUPPORT",
       "-DARDUINO_XIAO_ESP32C6",
       "-DARDUINO_USB_MODE=1",
       "-DARDUINO_USB_CDC_ON_BOOT=1"

cspell.json

@@ -9,6 +9,7 @@
       }
     ],
     "dictionaries": ["project-words"],
+    "caseSensitive": false,
     "ignorePaths": [
     "node_modules", 
     "compile_commands.json", 
@@ -36,6 +37,8 @@
     "pnpm-*.yaml",
     "vite.config.ts",
     "lib/esp32-psram/**",
-    "test/test_api/test_api.h"
+    "test/test_api/test_api.h",
+    "lib_standalone/**",
+    "**/*.js"
   ]
   }

data/pre_load.json

@@ -1,10 +1,22 @@
+{
+  "type": "systembackup",
+  "version": "3.8.2",
+  "date": "2026-03-29T13:28:15",
+  "systembackup": [
     {
       "type": "settings",
       "Network": {
-      "ssid": "my_wifi_ssid",
+        "ssid": "",
         "bssid": "",
-      "password": "my_wifi_password",
-      "hostname": "ems-esp"
+        "password": "",
+        "hostname": "ems-esp",
+        "static_ip_config": false,
+        "bandwidth20": false,
+        "nosleep": true,
+        "enableMDNS": true,
+        "enableCORS": false,
+        "CORSOrigin": "*",
+        "tx_power": 0
       },
       "AP": {
         "provision_mode": 2,
@@ -21,12 +33,14 @@
         "enableTLS": false,
         "rootCA": "",
         "enabled": false,
-      "host": "127.0.0.1",
+        "host": "",
         "port": 1883,
         "base": "ems-esp",
-      "username": "username",
-      "password": "password",
-      "client_id": "ems-esp",
+        "username": "",
+        "password": "",
+        "client_id": "esp32-b8ffc9ec",
+        "keep_alive": 60,
+        "clean_session": false,
         "entity_format": 1,
         "publish_time_boiler": 10,
         "publish_time_thermostat": 10,
@@ -42,6 +56,7 @@
         "nested_format": 1,
         "discovery_prefix": "homeassistant",
         "discovery_type": 0,
+        "ha_number_mode": 0,
         "publish_single": false,
         "publish_single2cmd": false,
         "send_response": false
@@ -68,18 +83,146 @@
         ]
       },
       "Settings": {
-      "board_profile": "S3",
+        "version": "3.8.2",
+        "board_profile": "E32V2_2",
+        "platform": "ESP32",
         "locale": "en",
         "tx_mode": 1,
         "ems_bus_id": 11,
+        "syslog_enabled": false,
+        "syslog_level": 3,
+        "trace_raw": false,
+        "syslog_mark_interval": 0,
+        "syslog_host": "",
+        "syslog_port": 514,
         "boiler_heatingoff": false,
-      "hide_led": true,
+        "remote_timeout": 24,
+        "remote_timeout_en": false,
+        "shower_timer": false,
+        "shower_alert": false,
+        "shower_alert_coldshot": 10,
+        "shower_alert_trigger": 7,
+        "shower_min_duration": 180,
+        "rx_gpio": 4,
+        "tx_gpio": 5,
+        "dallas_gpio": 14,
+        "dallas_parasite": false,
+        "led_gpio": 32,
+        "hide_led": false,
+        "led_type": 1,
+        "low_clock": false,
         "telnet_enabled": true,
         "notoken_api": false,
+        "readonly_mode": false,
         "analog_enabled": true,
+        "pbutton_gpio": 34,
+        "solar_maxflow": 30,
         "fahrenheit": false,
         "bool_format": 1,
         "bool_dashboard": 1,
-      "enum_format": 1
+        "enum_format": 1,
+        "weblog_level": 6,
+        "weblog_buffer": 50,
+        "weblog_compact": true,
+        "phy_type": 1,
+        "eth_power": 15,
+        "eth_phy_addr": 0,
+        "eth_clock_mode": 1,
+        "modbus_enabled": false,
+        "modbus_port": 502,
+        "modbus_max_clients": 10,
+        "modbus_timeout": 300,
+        "developer_mode": true,
+        "email_enabled": false,
+        "email_ssl": false,
+        "email_starttls": true,
+        "email_server": "smtp.example.net",
+        "email_port": 587,
+        "email_login": "",
+        "email_pass": "",
+        "email_sender": "ems-esp@example.net",
+        "email_recp": "",
+        "email_subject": "ems-esp notification"
+      }
+    },
+    {
+      "type": "schedule",
+      "Schedule": {
+        "schedule": []
+      }
+    },
+    {
+      "type": "customizations",
+      "Customizations": {
+        "ts": [
+          {
+            "id": "28_1767_7B13_2502",
+            "name": "gateway_temperature",
+            "offset": 0,
+            "is_system": true
+          }
+        ],
+        "as": [
+          {
+            "gpio": 39,
+            "name": "core_voltage",
+            "offset": 0,
+            "factor": 0.003771,
+            "uom": 23,
+            "type": 3,
+            "is_system": true
+          },
+          {
+            "gpio": 36,
+            "name": "supply_voltage",
+            "offset": 0,
+            "factor": 0.017,
+            "uom": 23,
+            "type": 3,
+            "is_system": true
+          },
+          {
+            "gpio": 2,
+            "name": "led",
+            "offset": 0,
+            "factor": 1,
+            "uom": 0,
+            "type": 6,
+            "is_system": true
+          }
+        ],
+        "masked_entities": []
+      }
+    },
+    {
+      "type": "entities",
+      "Entities": {
+        "entities": []
+      }
+    },
+    {
+      "type": "modules",
+      "Modules": {
+        "modules": []
+      }
+    },
+    {
+      "type": "customSupport",
+      "Support": {
+        "html": [
+          "This product is installed and managed by:",
+          "",
+          "<b>Bosch Installer Example</b>",
+          "",
+          "Nefit Road 12",
+          "1234 AB Amsterdam",
+          "Phone: +31 123 456 789",
+          "email: support@boschinstaller.nl",
+          "",
+          "For help and questions please <a target='_blank' href='https://emsesp.org'>contact</a> your installer."
+        ],
+        "img_url": "https://emsesp.org/media/images/designer.png"
       }
     }
+  ]
+}

docs/dump_telegrams.csv

@@ -13,7 +13,7 @@ telegram_type_id,name,is_fetched
 0x19,UBAMonitorSlow, 
 0x1A,UBASetPoints, 
 0x1C,UBAMaintenanceStatus, 
-0x1E,WM10TempMessage, 
+0x1E,HydrTemp, 
 0x23,JunkersSetMixer,fetched
 0x27,UBASettingsWW,fetched
 0x28,WeatherComp,fetched
@@ -72,11 +72,12 @@ telegram_type_id,name,is_fetched
 0xE6,UBAParametersPlus,fetched
 0xE9,UBAMonitorWWPlus, 
 0xEA,UBAParameterWWPlus,fetched
+0xEB,PumpKick,fetched
 0x0101,ISM1Set,fetched
 0x0103,ISM1StatusMessage,fetched
 0x0104,ISM2StatusMessage, 
 0x010C,IPMStatusMessage, 
-0x011E,JunkersDisp,fetched
+0x011E,IPMTempMessage, 
 0x012E,HPEnergy1, 
 0x013B,HPEnergy2, 
 0x0165,JunkersSet, 
@@ -111,8 +112,8 @@ telegram_type_id,name,is_fetched
 0x02A0,RC300Curves, 
 0x02A1,RC300Curves, 
 0x02A2,RC300Curves, 
-0x02A5,RC300Monitor, 
-0x02A6,RC300Monitor, 
+0x02A5,RC300Monitor,fetched
+0x02A6,CRFMonitor, 
 0x02A7,RC300Monitor, 
 0x02A8,CRFMonitor, 
 0x02A9,RC300Monitor, 
@@ -197,7 +198,7 @@ telegram_type_id,name,is_fetched
 0x04A2,HpInput,fetched
 0x04A5,HPFan,fetched
 0x04A7,HPPowerLimit,fetched
-0x04AA,HPPower2,fetched
+0x04AA,HPPower, 
 0x04AE,HPEnergy,fetched
 0x04AF,HPMeters,fetched
 0x055C,VentilationSet,fetched

interface/.typesafe-i18n.json

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

interface/eslint.config.js

@@ -1,9 +1,10 @@
 // @ts-check
 import eslint from '@eslint/js';
 import prettierConfig from 'eslint-config-prettier';
+import { defineConfig } from 'eslint/config';
 import tseslint from 'typescript-eslint';
 
-export default tseslint.config(
+export default defineConfig(
   eslint.configs.recommended,
   ...tseslint.configs.recommendedTypeChecked,
   prettierConfig,

interface/package.json

@@ -1,6 +1,6 @@
 {
   "name": "EMS-ESP",
-  "version": "3.8.0",
+  "version": "3.8.2",
   "description": "EMS-ESP WebUI",
   "homepage": "https://emsesp.org",
   "author": "proddy, emsesp.org",
@@ -17,7 +17,7 @@
     "preview-standalone": "typesafe-i18n --no-watch && vite build && concurrently -c \"auto\" \"pnpm:mock-rest\" \"vite preview\"",
     "standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite dev\"",
     "typesafe-i18n": "typesafe-i18n --no-watch",
-    "build_webUI": "typesafe-i18n --no-watch && vite build && node progmem-generator.js",
+    "build-webUI": "typesafe-i18n --no-watch && vite build && node progmem-generator.js",
     "format": "prettier -l -w '**/*.{ts,tsx,js,css,json,md}'",
     "lint": "eslint . --fix",
     "standalone-devcontainer": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite --host\""
@@ -26,46 +26,45 @@
     "@alova/adapter-xhr": "2.3.1",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@mui/icons-material": "^7.3.7",
-    "@mui/material": "^7.3.7",
-    "@preact/compat": "^18.3.1",
+    "@mui/icons-material": "^9.0.0",
+    "@mui/material": "^9.0.0",
+    "@preact/compat": "^18.3.2",
     "@table-library/react-table-library": "4.1.15",
-    "alova": "3.4.1",
+    "alova": "^3.5.1",
     "async-validator": "^4.2.5",
     "etag": "^1.8.1",
     "formidable": "^3.5.4",
     "jwt-decode": "^4.0.0",
     "magic-string": "^0.30.21",
     "mime-types": "^3.0.2",
-    "preact": "^10.28.2",
-    "react": "^19.2.3",
-    "react-dom": "^19.2.3",
-    "react-icons": "^5.5.0",
-    "react-router": "^7.12.0",
+    "preact": "^10.29.1",
+    "react": "^19.2.5",
+    "react-dom": "^19.2.5",
+    "react-icons": "^5.6.0",
+    "react-router": "^7.14.1",
     "react-toastify": "^11.0.5",
-    "typesafe-i18n": "^5.26.2",
-    "typescript": "^5.9.3"
+    "typesafe-i18n": "^5.27.1",
+    "typescript": "^6.0.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.28.5",
-    "@eslint/js": "^9.39.2",
-    "@preact/compat": "^18.3.1",
-    "@preact/preset-vite": "^2.10.2",
+    "@babel/core": "^7.29.0",
+    "@eslint/js": "^10.0.1",
+    "@preact/compat": "^18.3.2",
+    "@preact/preset-vite": "^2.10.5",
     "@trivago/prettier-plugin-sort-imports": "^6.0.2",
-    "@types/node": "^25.0.6",
-    "@types/react": "^19.2.8",
+    "@types/node": "^25.6.0",
+    "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
-    "axe-core": "^4.11.1",
+    "axe-core": "^4.11.3",
     "concurrently": "^9.2.1",
-    "eslint": "^9.39.2",
+    "eslint": "^10.2.1",
     "eslint-config-prettier": "^10.1.8",
-    "prettier": "^3.7.4",
-    "rollup-plugin-visualizer": "^6.0.5",
-    "terser": "^5.44.1",
-    "typescript-eslint": "^8.52.0",
-    "vite": "^7.3.1",
-    "vite-plugin-imagemin": "^0.6.1",
-    "vite-tsconfig-paths": "^6.0.4"
+    "prettier": "^3.8.3",
+    "rollup-plugin-visualizer": "^7.0.1",
+    "terser": "^5.46.1",
+    "typescript-eslint": "^8.58.2",
+    "vite": "^8.0.8",
+    "vite-plugin-imagemin": "^0.6.1"
   },
-  "packageManager": "pnpm@10.28.0+sha512.05df71d1421f21399e053fde567cea34d446fa02c76571441bfc1c7956e98e363088982d940465fd34480d4d90a0668bc12362f8aa88000a64e83d0b0e47be48"
+  "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
 }

interface/progmem-generator.js

@@ -24,20 +24,26 @@ let bundleStats = {
   other: { count: 0, uncompressed: 0, compressed: 0 }
 };
 
-const generateWWWClass =
-  () => `typedef std::function<void(const char * uri, const String & contentType, const uint8_t * content, size_t len, const String & hash)> RouteRegistrationHandler;
-// Bundle Statistics:
+// AsyncWebHandler that performs the lookup.
+const generateWWWClass = () => `// Bundle Statistics:
 // - Total compressed size: ${(totalSize / 1000).toFixed(1)} KB
 // - Total uncompressed size: ${(Object.values(bundleStats).reduce((sum, stat) => sum + stat.uncompressed, 0) / 1000).toFixed(1)} KB
 // - Compression ratio: ${(((Object.values(bundleStats).reduce((sum, stat) => sum + stat.uncompressed, 0) - totalSize) / Object.values(bundleStats).reduce((sum, stat) => sum + stat.uncompressed, 0)) * 100).toFixed(1)}%
 // - Generated on: ${new Date().toISOString()}
 
-class WWWData {
-${INDENT}public:
-${INDENT.repeat(2)}static void registerRoutes(RouteRegistrationHandler handler) {
-${fileInfo.map((f) => `${INDENT.repeat(3)}handler("${f.uri}", "${f.mimeType}", ${f.variable}, ${f.size}, ${f.hash});`).join('\n')}
-${INDENT.repeat(2)}}
+struct WWWAsset {
+${INDENT}const char *    uri;
+${INDENT}const char *    contentType;
+${INDENT}const uint8_t * content;
+${INDENT}size_t          len;
+${INDENT}const char *    etag; // already includes enclosing double quotes
 };
+
+static const WWWAsset WWW_ASSETS[] = {
+${fileInfo.map((f) => `${INDENT}{"${f.uri}", "${f.mimeType}", ${f.variable}, ${f.size}, "\\"${f.rawHash}\\""},`).join('\n')}
+};
+
+static constexpr size_t WWW_ASSETS_COUNT = sizeof(WWW_ASSETS) / sizeof(WWW_ASSETS[0]);
 `;
 
 const getFilesSync = (dir, files = []) => {
@@ -72,6 +78,7 @@ const writeFile = (relativeFilePath, buffer) => {
   const zipBuffer = zlib.gzipSync(buffer, { level: 9 });
   // const hash = crypto.createHash('sha256').update(zipBuffer).digest('hex');
   const hash = etag(zipBuffer); // use smaller md5 instead of sha256
+  const rawHash = hash.replace(/^"|"$/g, '');
 
   zipBuffer.forEach((b) => {
     if (!(size % bytesPerLine)) {
@@ -94,7 +101,8 @@ const writeFile = (relativeFilePath, buffer) => {
     mimeType,
     variable,
     size,
-    hash
+    hash,
+    rawHash
   });
 
   totalSize += size;

interface/src/AppRouting.tsx

@@ -1,19 +1,13 @@
-import { type FC, Suspense, lazy, memo, useContext, useEffect, useRef } from 'react';
+import { type FC, memo, useContext, useEffect, useRef } from 'react';
 import { Navigate, Route, Routes } from 'react-router';
 import { toast } from 'react-toastify';
 
-import {
-  LoadingSpinner,
-  RequireAuthenticated,
-  RequireUnauthenticated
-} from 'components';
+import AuthenticatedRouting from 'AuthenticatedRouting';
+import SignIn from 'SignIn';
+import { RequireAuthenticated, RequireUnauthenticated } from 'components';
 import { Authentication, AuthenticationContext } from 'contexts/authentication';
 import { useI18nContext } from 'i18n/i18n-react';
 
-// Lazy load route components for better code splitting
-const SignIn = lazy(() => import('SignIn'));
-const AuthenticatedRouting = lazy(() => import('AuthenticatedRouting'));
-
 interface SecurityRedirectProps {
   readonly message: string;
   readonly signOut?: boolean;
@@ -45,7 +39,6 @@ const AppRouting: FC = memo(() => {
 
   return (
     <Authentication>
-      <Suspense fallback={<LoadingSpinner />}>
       <Routes>
         <Route
           path="/unauthorized"
@@ -72,7 +65,6 @@ const AppRouting: FC = memo(() => {
           }
         />
       </Routes>
-      </Suspense>
     </Authentication>
   );
 });

interface/src/AuthenticatedRouting.tsx

@@ -1,44 +1,39 @@
-import { Suspense, lazy, memo, useContext } from 'react';
+import { memo, useContext } from 'react';
 import { Navigate, Route, Routes } from 'react-router';
 
-import { Layout, LoadingSpinner } from 'components';
+import CustomEntities from 'app/main/CustomEntities';
+import Customizations from 'app/main/Customizations';
+import Dashboard from 'app/main/Dashboard';
+import Devices from 'app/main/Devices';
+import Help from 'app/main/Help';
+import Modules from 'app/main/Modules';
+import Scheduler from 'app/main/Scheduler';
+import Sensors from 'app/main/Sensors';
+import UserProfile from 'app/main/UserProfile';
+import APSettings from 'app/settings/APSettings';
+import ApplicationSettings from 'app/settings/ApplicationSettings';
+import DownloadUpload from 'app/settings/DownloadUpload';
+import MqttSettings from 'app/settings/MqttSettings';
+import NTPSettings from 'app/settings/NTPSettings';
+import Settings from 'app/settings/Settings';
+import Network from 'app/settings/network/Network';
+import Security from 'app/settings/security/Security';
+import APStatus from 'app/status/APStatus';
+import Activity from 'app/status/Activity';
+import HardwareStatus from 'app/status/HardwareStatus';
+import MqttStatus from 'app/status/MqttStatus';
+import NTPStatus from 'app/status/NTPStatus';
+import NetworkStatus from 'app/status/NetworkStatus';
+import Status from 'app/status/Status';
+import SystemLog from 'app/status/SystemLog';
+import Version from 'app/status/Version';
+import { Layout } from 'components';
 import { AuthenticatedContext } from 'contexts/authentication';
 
-// Lazy load all route components for better code splitting
-const Dashboard = lazy(() => import('app/main/Dashboard'));
-const Devices = lazy(() => import('app/main/Devices'));
-const Sensors = lazy(() => import('app/main/Sensors'));
-const Help = lazy(() => import('app/main/Help'));
-const Customizations = lazy(() => import('app/main/Customizations'));
-const Scheduler = lazy(() => import('app/main/Scheduler'));
-const CustomEntities = lazy(() => import('app/main/CustomEntities'));
-const Modules = lazy(() => import('app/main/Modules'));
-const UserProfile = lazy(() => import('app/main/UserProfile'));
-
-const Status = lazy(() => import('app/status/Status'));
-const HardwareStatus = lazy(() => import('app/status/HardwareStatus'));
-const Activity = lazy(() => import('app/status/Activity'));
-const SystemLog = lazy(() => import('app/status/SystemLog'));
-const MqttStatus = lazy(() => import('app/status/MqttStatus'));
-const NTPStatus = lazy(() => import('app/status/NTPStatus'));
-const APStatus = lazy(() => import('app/status/APStatus'));
-const NetworkStatus = lazy(() => import('app/status/NetworkStatus'));
-const Version = lazy(() => import('app/status/Version'));
-
-const Settings = lazy(() => import('app/settings/Settings'));
-const ApplicationSettings = lazy(() => import('app/settings/ApplicationSettings'));
-const MqttSettings = lazy(() => import('app/settings/MqttSettings'));
-const NTPSettings = lazy(() => import('app/settings/NTPSettings'));
-const APSettings = lazy(() => import('app/settings/APSettings'));
-const DownloadUpload = lazy(() => import('app/settings/DownloadUpload'));
-const Network = lazy(() => import('app/settings/network/Network'));
-const Security = lazy(() => import('app/settings/security/Security'));
-
 const AuthenticatedRouting = memo(() => {
   const { me } = useContext(AuthenticatedContext);
   return (
     <Layout>
-      <Suspense fallback={<LoadingSpinner />}>
       <Routes>
         <Route path="/dashboard/*" element={<Dashboard />} />
         <Route path="/devices/*" element={<Devices />} />
@@ -59,10 +54,7 @@ const AuthenticatedRouting = memo(() => {
         {me.admin && (
           <>
             <Route path="/settings" element={<Settings />} />
-              <Route
-                path="/settings/application"
-                element={<ApplicationSettings />}
-              />
+            <Route path="/settings/application" element={<ApplicationSettings />} />
             <Route path="/settings/mqtt" element={<MqttSettings />} />
             <Route path="/settings/ntp" element={<NTPSettings />} />
             <Route path="/settings/ap" element={<APSettings />} />
@@ -80,7 +72,6 @@ const AuthenticatedRouting = memo(() => {
 
         <Route path="/*" element={<Navigate to="/" />} />
       </Routes>
-      </Suspense>
     </Layout>
   );
 });

interface/src/SignIn.tsx

@@ -3,6 +3,7 @@ import { toast } from 'react-toastify';
 
 import ForwardIcon from '@mui/icons-material/Forward';
 import { Box, Button, Paper, Typography } from '@mui/material';
+import type { Theme } from '@mui/material/styles';
 
 import * as AuthenticationApi from 'components/routing/authentication';
 import { useRequest } from 'alova/client';
@@ -36,7 +37,7 @@ const SignIn = memo(() => {
     {
       immediate: false
     }
-  ).onSuccess((response) => {
+  ).onSuccess((response: { data: { access_token: string } }) => {
     if (response.data) {
       authenticationContext.signIn(response.data.access_token);
     }
@@ -78,7 +79,6 @@ const SignIn = memo(() => {
     }
   }, [signInRequest, signIn, LL]);
 
-  // Memoize callback to prevent recreation on every render
   const submitOnEnter = useMemo(() => onEnterCallback(signIn), [signIn]);
 
   // get rid of scrollbar
@@ -92,13 +92,15 @@ const SignIn = memo(() => {
 
   return (
     <Box
-      display="flex"
-      height="100vh"
-      margin="auto"
-      padding={2}
-      justifyContent="center"
-      flexDirection="column"
-      maxWidth={(theme) => theme.breakpoints.values.sm}
+      sx={(theme: Theme) => ({
+        display: 'flex',
+        height: '100vh',
+        margin: 'auto',
+        padding: 2,
+        justifyContent: 'center',
+        flexDirection: 'column',
+        maxWidth: theme.breakpoints.values.sm
+      })}
     >
       <Paper
         sx={(theme) => ({
@@ -111,16 +113,18 @@ const SignIn = memo(() => {
           width: '100%'
         })}
       >
-        <Typography mb={1} variant="h4">
+        <Typography sx={{ mb: 1 }} variant="h4">
           {PROJECT_NAME}
         </Typography>
         <LanguageSelector />
         <Box
-          mt={1}
-          display="flex"
-          flexDirection="column"
-          gap={1}
-          alignItems="center"
+          sx={{
+            mt: 1,
+            display: 'flex',
+            flexDirection: 'column',
+            gap: 1,
+            alignItems: 'center'
+          }}
         >
           <ValidatedTextField
             fieldErrors={fieldErrors || {}}

interface/src/app/main/CustomEntities.tsx

@@ -310,13 +310,15 @@ const CustomEntities = () => {
                       />
                     )}
                   </Cell>
+                  <Cell>{ei.ram > 0 ? '' : showHex(ei.device_id as number, 2)}</Cell>
+                  <Cell>{ei.ram > 0 ? '' : showHex(ei.type_id as number, 3)}</Cell>
+                  <Cell>{ei.ram > 0 ? '' : ei.offset}</Cell>
                   <Cell>
-                    {ei.ram === 1 ? '' : showHex(ei.device_id as number, 2)}
-                  </Cell>
-                  <Cell>{ei.ram === 1 ? '' : showHex(ei.type_id as number, 3)}</Cell>
-                  <Cell>{ei.ram === 1 ? '' : ei.offset}</Cell>
-                  <Cell>
-                    {ei.ram === 1 ? 'RAM' : DeviceValueTypeNames[ei.value_type]}
+                    {ei.ram === 1
+                      ? 'RAM'
+                      : ei.ram === 2
+                        ? 'NVS'
+                        : DeviceValueTypeNames[ei.value_type]}
                   </Cell>
                   <Cell>{formatValue(ei.value, ei.uom)}</Cell>
                 </Row>
@@ -341,9 +343,9 @@ const CustomEntities = () => {
   return (
     <SectionContent>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
-      <Box mb={2} color="warning.main">
-        <Typography variant="body1">{LL.ENTITIES_HELP_1()}.</Typography>
-      </Box>
+      <Typography sx={{ mb: 2 }} color="warning" variant="body1">
+        {LL.ENTITIES_HELP_1()}.
+      </Typography>
 
       {renderEntity()}
 
@@ -359,8 +361,8 @@ const CustomEntities = () => {
         />
       )}
 
-      <Box mt={2} display="flex" flexWrap="wrap">
-        <Box flexGrow={1}>
+      <Box sx={{ mt: 2, display: 'flex', flexWrap: 'wrap' }}>
+        <Box sx={{ flexGrow: 1 }}>
           {numChanges > 0 && (
             <ButtonRow>
               <Button
@@ -382,7 +384,7 @@ const CustomEntities = () => {
             </ButtonRow>
           )}
         </Box>
-        <Box flexWrap="nowrap" whiteSpace="nowrap">
+        <Box sx={{ flexWrap: 'nowrap', whiteSpace: 'nowrap' }}>
           <Button
             startIcon={<AddIcon />}
             variant="outlined"

interface/src/app/main/CustomEntitiesDialog.tsx

@@ -7,7 +7,7 @@ import DoneIcon from '@mui/icons-material/Done';
 import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined';
 import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
 import InsertCommentOutlinedIcon from '@mui/icons-material/InsertCommentOutlined';
-import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
+import RemoveIcon from '@mui/icons-material/RemoveCircleOutlined';
 import {
   Box,
   Button,
@@ -178,7 +178,7 @@ const CustomEntitiesDialog = ({
               onChange={updateFormValue}
             />
           </Grid>
-          <Grid mt={3}>
+          <Grid sx={{ mt: 3 }}>
             <BlockFormControlLabel
               control={
                 <Checkbox
@@ -205,9 +205,10 @@ const CustomEntitiesDialog = ({
             >
               <MenuItem value={0}>EMS-{LL.VALUE(1)}</MenuItem>
               <MenuItem value={1}>RAM-{LL.VALUE(1)}</MenuItem>
+              <MenuItem value={2}>NVS-{LL.VALUE(1)}</MenuItem>
             </TextField>
           </Grid>
-          {editItem.ram === 1 && (
+          {editItem.ram > 0 && (
             <>
               <Grid>
                 <TextField
@@ -237,7 +238,7 @@ const CustomEntitiesDialog = ({
           )}
           {editItem.ram === 0 && (
             <>
-              <Grid mt={3}>
+              <Grid sx={{ mt: 3 }}>
                 <BlockFormControlLabel
                   control={
                     <Checkbox
@@ -403,7 +404,7 @@ const CustomEntitiesDialog = ({
       </DialogContent>
       <DialogActions>
         {!creating && (
-          <Box flexGrow={1}>
+          <Box sx={{ flexGrow: 1 }}>
             <Button
               startIcon={<RemoveIcon />}
               variant="outlined"

interface/src/app/main/Customizations.tsx

@@ -111,13 +111,14 @@ const Customizations = () => {
   const [selectedDeviceTypeNameURL, setSelectedDeviceTypeNameURL] =
     useState<string>(''); // needed for API URL
   const [selectedDeviceName, setSelectedDeviceName] = useState<string>('');
+  const [selectedDeviceBrand, setSelectedDeviceBrand] = useState<string>('');
 
   const { send: sendResetCustomizations } = useRequest(resetCustomizations(), {
     immediate: false
   });
 
   const { send: sendDeviceName } = useRequest(
-    (data: { id: number; name: string }) => writeDeviceName(data),
+    (data: { id: number; name: string; brand: string }) => writeDeviceName(data),
     {
       immediate: false
     }
@@ -267,6 +268,7 @@ const Customizations = () => {
         if (device) {
           setSelectedDeviceTypeNameURL(device.url || '');
           setSelectedDeviceName(device.n);
+          setSelectedDeviceBrand(device.b);
         }
         setNumChanges(0);
         setRestartNeeded(false);
@@ -442,7 +444,11 @@ const Customizations = () => {
   }, [devices, deviceEntities, selectedDevice, sendCustomizationEntities, LL]);
 
   const renameDevice = useCallback(async () => {
-    await sendDeviceName({ id: selectedDevice, name: selectedDeviceName })
+    await sendDeviceName({
+      id: selectedDevice,
+      name: selectedDeviceName,
+      brand: selectedDeviceBrand
+    })
       .then(() => {
         toast.success(LL.UPDATED_OF(LL.NAME(1)));
       })
@@ -453,24 +459,42 @@ const Customizations = () => {
         setRename(false);
         await fetchCoreData();
       });
-  }, [selectedDevice, selectedDeviceName, sendDeviceName, LL, fetchCoreData]);
+  }, [
+    selectedDevice,
+    selectedDeviceName,
+    selectedDeviceBrand,
+    sendDeviceName,
+    LL,
+    fetchCoreData
+  ]);
 
   const renderDeviceList = () => (
     <>
-      <Box mb={1} color="warning.main">
-        <Typography variant="body1">{LL.CUSTOMIZATIONS_HELP_1()}.</Typography>
-      </Box>
-      <Box display="flex" flexWrap="wrap" alignItems="center" gap={2}>
+      <Typography sx={{ mb: 1 }} color="warning" variant="body1">
+        {LL.CUSTOMIZATIONS_HELP_1()}.
+      </Typography>
+      <Box sx={{ display: 'flex', flexWrap: 'wrap', alignItems: 'center', gap: 2 }}>
         {rename ? (
+          <>
             <TextField
               name="device"
               label={LL.EMS_DEVICE()}
-            fullWidth
+              style={{ minWidth: '48%' }}
               variant="outlined"
               value={selectedDeviceName}
               onChange={(e) => setSelectedDeviceName(e.target.value)}
               margin="normal"
             />
+            <TextField
+              name="brand"
+              label={LL.BRAND()}
+              style={{ minWidth: '48%' }}
+              variant="outlined"
+              value={selectedDeviceBrand}
+              onChange={(e) => setSelectedDeviceBrand(e.target.value)}
+              margin="normal"
+            />
+          </>
         ) : (
           <TextField
             name="device"
@@ -546,27 +570,22 @@ const Customizations = () => {
   const renderDeviceData = () => {
     return (
       <>
-        <Box color="warning.main">
-          <Typography variant="body2" mt={1} mb={1}>
+        <Typography sx={{ mt: 1, mb: 1 }} color="warning" variant="body2">
           <OptionIcon type="favorite" isSet={true} />={LL.CUSTOMIZATIONS_HELP_2()}
           &nbsp;&nbsp;
           <OptionIcon type="readonly" isSet={true} />={LL.CUSTOMIZATIONS_HELP_3()}
           &nbsp;&nbsp;
           <OptionIcon type="api_mqtt_exclude" isSet={true} />=
           {LL.CUSTOMIZATIONS_HELP_4()}&nbsp;&nbsp;
-            <OptionIcon type="web_exclude" isSet={true} />=
-            {LL.CUSTOMIZATIONS_HELP_5()}&nbsp;&nbsp;
+          <OptionIcon type="web_exclude" isSet={true} />={LL.CUSTOMIZATIONS_HELP_5()}
+          &nbsp;&nbsp;
           <OptionIcon type="deleted" isSet={true} />={LL.CUSTOMIZATIONS_HELP_6()}
         </Typography>
-        </Box>
         <Grid
           container
-          mb={1}
-          mt={0}
           spacing={2}
           direction="row"
-          justifyContent="flex-start"
-          alignItems="center"
+          sx={{ mb: 1, mt: 0, justifyContent: 'flex-start', alignItems: 'center' }}
         >
           <Grid>
             <TextField
@@ -755,8 +774,8 @@ const Customizations = () => {
           </Button>
         </MessageBox>
       ) : (
-        <Box display="flex" flexWrap="wrap">
-          <Box flexGrow={1}>
+        <Box sx={{ display: 'flex', flexWrap: 'wrap' }}>
+          <Box sx={{ flexGrow: 1 }}>
             {numChanges !== 0 && (
               <ButtonRow>
                 <Button

interface/src/app/main/CustomizationsDialog.tsx

@@ -37,7 +37,7 @@ interface LabelValueProps {
 
 const LabelValue = memo(({ label, value }: LabelValueProps) => (
   <Grid container direction="row">
-    <Typography variant="body2" color="warning.main">
+    <Typography variant="body2" color="warning">
       {label}:&nbsp;
     </Typography>
     <Typography variant="body2">{value}</Typography>
@@ -131,7 +131,7 @@ const CustomizationsDialog = ({
         />
         <LabelValue label={LL.WRITEABLE()} value={writeableIcon} />
 
-        <Box mt={1} mb={2}>
+        <Box sx={{ mt: 1, mb: 2 }}>
           <EntityMaskToggle onUpdate={updateDeviceEntity} de={editItem} />
         </Box>
 
@@ -172,7 +172,7 @@ const CustomizationsDialog = ({
         </Grid>
 
         {error && (
-          <Typography variant="body2" color="error" mt={2}>
+          <Typography sx={{ mt: 2 }} variant="body2" color="error">
             Error: Check min and max values
           </Typography>
         )}

interface/src/app/main/Dashboard.tsx

@@ -6,7 +6,7 @@ import { toast } from 'react-toastify';
 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
 import EditIcon from '@mui/icons-material/Edit';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
-import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
+import HelpOutlineIcon from '@mui/icons-material/HelpOutlined';
 import UnfoldLessIcon from '@mui/icons-material/UnfoldLess';
 import UnfoldMoreIcon from '@mui/icons-material/UnfoldMore';
 import {
@@ -262,12 +262,8 @@ const Dashboard = memo(() => {
 
     return (
       <>
-        {!data.connected && (
-          <MessageBox level="error" message={LL.EMS_BUS_WARNING()} />
-        )}
-
         {data.connected && data.nodes.length > 0 && !hasFavEntities && (
-          <MessageBox mb={2} level="warning">
+          <MessageBox sx={{ mb: 2 }} level="warning">
             <Typography>
               {LL.NO_DATA_1()}&nbsp;
               <Link to="/customizations" style={{ color: 'white' }}>
@@ -284,10 +280,12 @@ const Dashboard = memo(() => {
         )}
 
         <Box
-          display="flex"
-          justifyContent="flex-end"
-          flexWrap="nowrap"
-          whiteSpace="nowrap"
+          sx={{
+            display: 'flex',
+            justifyContent: 'flex-end',
+            flexWrap: 'nowrap',
+            whiteSpace: 'nowrap'
+          }}
         >
           <ToggleButtonGroup
             size="small"
@@ -310,7 +308,7 @@ const Dashboard = memo(() => {
         </Box>
 
         {data.nodes.length > 0 ? (
-          <Box mt={1} justifyContent="center" flexDirection="column">
+          <Box sx={{ mt: 1, justifyContent: 'center', flexDirection: 'column' }}>
             <IconContext.Provider
               value={{
                 color: 'lightblue',
@@ -377,13 +375,8 @@ const Dashboard = memo(() => {
             </IconContext.Provider>
           </Box>
         ) : (
-          <Box
-            display="flex"
-            // justifyContent="flex-end"
-            // flexWrap="nowrap"
-            // whiteSpace="nowrap"
-          >
-            <Typography mt={1} color="warning.main" variant="body1">
+          <Box sx={{ display: 'flex' }}>
+            <Typography sx={{ mt: 1 }} color="warning" variant="body1">
               no data
             </Typography>
             <Tooltip title={LL.DASHBOARD_1()}>

interface/src/app/main/DeviceIcon.tsx

@@ -1,4 +1,5 @@
 import { memo } from 'react';
+import type { IconType } from 'react-icons';
 import { AiOutlineAlert, AiOutlineControl, AiOutlineGateway } from 'react-icons/ai';
 import { CgSmartHomeBoiler } from 'react-icons/cg';
 import { FaSolarPanel } from 'react-icons/fa';
@@ -15,14 +16,9 @@ import { PiFan, PiGauge } from 'react-icons/pi';
 import { TiFlowSwitch, TiThermometer } from 'react-icons/ti';
 import { VscVmConnect } from 'react-icons/vsc';
 
-import type { SvgIconProps } from '@mui/material';
-
 import { DeviceType } from './types';
 
-const deviceIconLookup: Record<
-  DeviceType,
-  React.ComponentType<SvgIconProps> | null
-> = {
+const deviceIconLookup: Record<DeviceType, IconType | null> = {
   [DeviceType.TEMPERATURESENSOR]: TiThermometer,
   [DeviceType.ANALOGSENSOR]: PiGauge,
   [DeviceType.BOILER]: CgSmartHomeBoiler,

interface/src/app/main/Devices.tsx

@@ -8,7 +8,7 @@ import {
   useState
 } from 'react';
 import { IconContext } from 'react-icons';
-import { useNavigate } from 'react-router';
+import { Link, useNavigate } from 'react-router';
 import { toast } from 'react-toastify';
 
 import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined';
@@ -534,9 +534,19 @@ const Devices = memo(() => {
   const renderCoreData = () => (
     <>
       {!coreData.connected ? (
-        <MessageBox level="error" message={LL.EMS_BUS_WARNING()} />
+        <MessageBox level="error" message={LL.EMS_BUS_WARNING() + '.'}>
+          &nbsp;(
+          <Link
+            target="_blank"
+            to="https://docs.emsesp.org/Troubleshooting#ems-bus-is-not-connecting"
+            style={{ color: 'white' }}
+          >
+            {LL.ONLINE_HELP()}
+          </Link>
+          )
+        </MessageBox>
       ) : (
-        <Box justifyContent="center" flexDirection="column">
+        <Box sx={{ justifyContent: 'center', flexDirection: 'column' }}>
           <IconContext.Provider
             value={{
               color: 'lightblue',
@@ -660,12 +670,12 @@ const Devices = memo(() => {
         }}
       >
         <Box sx={{ p: 1 }}>
-          <Grid container justifyContent="space-between">
-            <Typography noWrap variant="subtitle1" color="warning.main">
+          <Grid container sx={{ justifyContent: 'space-between' }}>
+            <Typography noWrap variant="subtitle1" color="warning">
               {deviceInfo.n}&nbsp;(
               {deviceInfo.tn})
             </Typography>
-            <Grid justifyContent="flex-end">
+            <Grid sx={{ justifyContent: 'flex-end' }}>
               <ButtonTooltip title={LL.CLOSE()}>
                 <IconButton onClick={resetDeviceSelect} aria-label={LL.CLOSE()}>
                   <HighlightOffIcon color="primary" sx={{ fontSize: 18 }} />

interface/src/app/main/DevicesDialog.tsx

@@ -128,9 +128,9 @@ const DevicesDialog = ({
     <Dialog sx={dialogStyle} open={open} onClose={onClose}>
       <DialogTitle>{dialogTitle}</DialogTitle>
       <DialogContent dividers>
-        <Box color="warning.main" mb={2}>
-          <Typography variant="body2">{editItem.id.slice(2)}</Typography>
-        </Box>
+        <Typography sx={{ mb: 2 }} color="warning" variant="body2">
+          {editItem.id.slice(2)}
+        </Typography>
         <Grid container>
           <Grid size={12}>
             {editItem.l ? (

interface/src/app/main/Help.tsx

@@ -11,6 +11,7 @@ import {
   Box,
   Button,
   Divider,
+  Grid,
   Link,
   List,
   ListItem,
@@ -42,7 +43,7 @@ interface CustomSupport {
   html: string | null;
 }
 
-const DEFAULT_IMAGE_URL = 'https://emsesp.org/_media/images/installer.jpeg';
+const DEFAULT_IMAGE_URL = 'https://emsesp.org/media/images/installer.jpeg';
 
 const SUPPORT_BOX_STYLES: SxProps<Theme> = {
   borderRadius: 3,
@@ -71,7 +72,6 @@ const HelpComponent = () => {
   });
   const [imgError, setImgError] = useState<boolean>(false);
 
-  // Memoize the request method to prevent re-creation on every render
   const getCustomSupportMethod = useMemo(
     () => callAction({ action: 'getCustomSupport' }),
     []
@@ -120,7 +120,7 @@ const HelpComponent = () => {
         label: () => LL.HELP_INFORMATION_1()
       },
       {
-        href: 'https://discord.gg/3J3GgnzpyT',
+        href: 'https://discord.gg/GP9DPSgeJq',
         icon: <CommentIcon />,
         label: () => LL.HELP_INFORMATION_2()
       },
@@ -146,11 +146,9 @@ const HelpComponent = () => {
     <SectionContent>
       {customSupport.html && (
         <Stack
-          padding={1}
-          mb={2}
           direction="row"
           divider={<Divider orientation="vertical" flexItem />}
-          sx={SUPPORT_BOX_STYLES}
+          sx={{ padding: 1, mb: 2, ...SUPPORT_BOX_STYLES }}
         >
           <Typography variant="subtitle1">
             <div dangerouslySetInnerHTML={{ __html: customSupport.html }} />
@@ -185,9 +183,9 @@ const HelpComponent = () => {
         </List>
       )}
 
-      <Box p={2} color="warning.main">
-        <Typography mb={1} variant="body1">
-          {LL.HELP_INFORMATION_4()}.
+      <Grid container spacing={2} sx={{ mt: 2, alignItems: 'center' }}>
+        <Typography sx={{ mb: 1 }} color="warning" variant="body1">
+          {LL.HELP_INFORMATION_4()}:
         </Typography>
         <Button
           startIcon={<DownloadIcon />}
@@ -197,11 +195,11 @@ const HelpComponent = () => {
         >
           {LL.SUPPORT_INFORMATION(0)}
         </Button>
-      </Box>
+      </Grid>
 
       <Divider sx={{ mt: 4 }} />
 
-      <Typography color="white" variant="subtitle1" align="center" mt={1}>
+      <Typography color="white" variant="subtitle1" align="center" sx={{ mt: 1 }}>
         &copy;&nbsp;
         <Link
           target="_blank"

interface/src/app/main/Modules.tsx

@@ -186,9 +186,9 @@ const Modules = () => {
 
     return (
       <>
-        <Box mb={2} color="warning.main">
-          <Typography variant="body1">{LL.MODULES_DESCRIPTION()}.</Typography>
-        </Box>
+        <Typography sx={{ mb: 2 }} color="warning" variant="body1">
+          {LL.MODULES_DESCRIPTION()}.
+        </Typography>
         <Table
           data={{ nodes: modules }}
           theme={modules_theme}
@@ -236,8 +236,8 @@ const Modules = () => {
           )}
         </Table>
 
-        <Box mt={1} display="flex" flexWrap="wrap">
-          <Box flexGrow={1}>
+        <Box sx={{ mt: 1, display: 'flex', flexWrap: 'wrap' }}>
+          <Box sx={{ flexGrow: 1 }}>
             {numChanges !== 0 && (
               <ButtonRow>
                 <Button

interface/src/app/main/ModulesDialog.tsx

@@ -79,7 +79,7 @@ const ModulesDialog = ({
             label="Enabled"
           />
         </Grid>
-        <Box mt={2} mb={1}>
+        <Box sx={{ mt: 2, mb: 1 }}>
           <TextField
             name="license"
             label="License Key"

interface/src/app/main/OptionIcon.tsx

@@ -2,12 +2,12 @@ import { memo } from 'react';
 
 import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined';
 import DeleteForeverIcon from '@mui/icons-material/DeleteForever';
-import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
+import DeleteOutlineIcon from '@mui/icons-material/DeleteOutlined';
 import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined';
 import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
 import InsertCommentOutlinedIcon from '@mui/icons-material/InsertCommentOutlined';
 import StarIcon from '@mui/icons-material/Star';
-import StarOutlineIcon from '@mui/icons-material/StarOutline';
+import StarOutlineIcon from '@mui/icons-material/StarOutlined';
 import VisibilityOffOutlinedIcon from '@mui/icons-material/VisibilityOffOutlined';
 import VisibilityOutlinedIcon from '@mui/icons-material/VisibilityOutlined';
 import type { SvgIconProps } from '@mui/material';

interface/src/app/main/Scheduler.tsx

@@ -358,9 +358,9 @@ const Scheduler = () => {
   return (
     <SectionContent>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
-      <Box mb={2} color="warning.main">
-        <Typography variant="body1">{LL.SCHEDULER_HELP_1()}.</Typography>
-      </Box>
+      <Typography sx={{ mb: 2 }} color="warning" variant="body1">
+        {LL.SCHEDULER_HELP_1()}.
+      </Typography>
       {renderSchedule()}
 
       {selectedScheduleItem && (
@@ -375,8 +375,8 @@ const Scheduler = () => {
         />
       )}
 
-      <Box display="flex" flexWrap="wrap">
-        <Box flexGrow={1}>
+      <Box sx={{ display: 'flex', flexWrap: 'wrap' }}>
+        <Box sx={{ flexGrow: 1 }}>
           {numChanges !== 0 && (
             <ButtonRow>
               <Button
@@ -398,7 +398,7 @@ const Scheduler = () => {
             </ButtonRow>
           )}
         </Box>
-        <Box flexWrap="nowrap" whiteSpace="nowrap">
+        <Box sx={{ flexWrap: 'nowrap', whiteSpace: 'nowrap' }}>
           <ButtonRow>
             <Button
               startIcon={<AddIcon />}

interface/src/app/main/SchedulerDialog.tsx

@@ -4,7 +4,7 @@ import AddIcon from '@mui/icons-material/Add';
 import CancelIcon from '@mui/icons-material/Cancel';
 import DoneIcon from '@mui/icons-material/Done';
 import PlayArrowIcon from '@mui/icons-material/PlayArrow';
-import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
+import RemoveIcon from '@mui/icons-material/RemoveCircleOutlined';
 import {
   Box,
   Button,
@@ -338,11 +338,13 @@ const SchedulerDialog = ({
                     onChange={updateFormValue}
                   />
                   {isTimerSchedule && (
-                    <Box color="warning.main" ml={2} mt={4}>
-                      <Typography variant="body2">
+                    <Typography
+                      sx={{ ml: 2, mt: 4 }}
+                      color="warning"
+                      variant="body2"
+                    >
                       {LL.SCHEDULER_HELP_2()}
                     </Typography>
-                    </Box>
                   )}
                 </>
               ) : (
@@ -391,7 +393,7 @@ const SchedulerDialog = ({
 
       <DialogActions>
         {!creating && (
-          <Box flexGrow={1}>
+          <Box sx={{ flexGrow: 1 }}>
             <Button
               startIcon={<RemoveIcon />}
               variant="outlined"

interface/src/app/main/Sensors.tsx

@@ -348,7 +348,7 @@ const Sensors = () => {
 
   const addAnalogSensor = useCallback(() => {
     if (firstAvailableGPIO.current === undefined) {
-      toast.error('No available GPIO found');
+      toast.error(LL.NO_GPIO());
       return;
     }
     setCreating(true);
@@ -591,7 +591,14 @@ const Sensors = () => {
         />
       )}
       {sensorData?.analog_enabled === true && me.admin && (
-        <Box mt={2} display="flex" flexWrap="wrap" justifyContent="flex-end">
+        <Box
+          sx={{
+            mt: 2,
+            display: 'flex',
+            flexWrap: 'wrap',
+            justifyContent: 'flex-end'
+          }}
+        >
           <Button
             variant="outlined"
             color="primary"

interface/src/app/main/SensorsAnalogDialog.tsx

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 
 import CancelIcon from '@mui/icons-material/Cancel';
 import DoneIcon from '@mui/icons-material/Done';
-import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
+import RemoveIcon from '@mui/icons-material/RemoveCircleOutlined';
 import WarningIcon from '@mui/icons-material/Warning';
 import {
   Box,
@@ -479,7 +479,7 @@ const SensorsAnalogDialog = ({
           )}
         </Grid>
         {fieldErrors && Object.keys(fieldErrors).length > 0 && (
-          <Box mt={1}>
+          <Box sx={{ mt: 1 }}>
             {Object.values(fieldErrors).map((errArr, idx) =>
               Array.isArray(errArr)
                 ? errArr.map((err, j) => (
@@ -487,7 +487,7 @@ const SensorsAnalogDialog = ({
                       key={`${idx}-${j}`}
                       color="error"
                       variant="caption"
-                      display="block"
+                      sx={{ display: 'block' }}
                     >
                       {err.message}
                     </Typography>
@@ -498,7 +498,7 @@ const SensorsAnalogDialog = ({
         )}
         {editItem.s && (
           <Grid>
-            <Typography mt={1} color="warning.main" variant="body2">
+            <Typography sx={{ mt: 1 }} color="warning" variant="body2">
               <WarningIcon
                 fontSize="small"
                 sx={{ mr: 1, verticalAlign: 'middle' }}
@@ -511,7 +511,7 @@ const SensorsAnalogDialog = ({
       </DialogContent>
       <DialogActions>
         {!creating && (
-          <Box flexGrow={1} sx={{ '& button': { mt: 0 } }}>
+          <Box sx={{ flexGrow: 1, '& button': { mt: 0 } }}>
             <Button
               startIcon={<RemoveIcon />}
               disabled={editItem.s}

interface/src/app/main/SensorsTemperatureDialog.tsx

@@ -4,7 +4,6 @@ import CancelIcon from '@mui/icons-material/Cancel';
 import DoneIcon from '@mui/icons-material/Done';
 import WarningIcon from '@mui/icons-material/Warning';
 import {
-  Box,
   Button,
   Dialog,
   DialogActions,
@@ -111,11 +110,9 @@ const SensorsTemperatureDialog = ({
     <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
       <DialogTitle>{dialogTitle}</DialogTitle>
       <DialogContent dividers>
-        <Box color="warning.main" mb={2}>
-          <Typography variant="body2">
+        <Typography sx={{ mb: 2 }} color="warning" variant="body2">
           {LL.ID_OF(LL.SENSOR(0))}: {editItem.id}
         </Typography>
-        </Box>
         <Grid container spacing={2}>
           <Grid>
             <ValidatedTextField
@@ -142,7 +139,7 @@ const SensorsTemperatureDialog = ({
         </Grid>
         {editItem.s && (
           <Grid>
-            <Typography mt={1} color="warning.main" variant="body2">
+            <Typography sx={{ mt: 1 }} color="warning" variant="body2">
               <WarningIcon
                 fontSize="small"
                 sx={{ mr: 1, verticalAlign: 'middle' }}

interface/src/app/main/UserProfile.tsx

@@ -41,8 +41,12 @@ const UserProfileComponent = () => {
           />
         </ListItem>
       </List>
-      <Box mt={2} mb={2} display="flex" alignItems="center">
-        <Typography mr={2} variant="body1" align="center">
+      <Box sx={{ mt: 2, mb: 2, display: 'flex', alignItems: 'center' }}>
+        <Typography
+          sx={{ mr: 2, textAlign: 'center' }}
+          color="warning"
+          variant="body1"
+        >
           {LL.LANGUAGE()}:
         </Typography>
         <LanguageSelector />

interface/src/app/main/types.ts

@@ -43,6 +43,16 @@ export interface Settings {
   modbus_port: number;
   modbus_max_clients: number;
   modbus_timeout: number;
+  email_enabled: boolean;
+  email_ssl?: boolean;
+  email_starttls?: boolean;
+  email_server: string;
+  email_port: number;
+  email_login: string;
+  email_pass: string;
+  email_sender: string;
+  email_recp: string;
+  email_subject: string;
   developer_mode: boolean;
 }
 

interface/src/app/settings/ApplicationSettings.tsx

@@ -28,6 +28,7 @@ import {
   FormLoader,
   MessageBox,
   SectionContent,
+  ValidatedPasswordField,
   ValidatedTextField,
   useLayoutTitle
 } from 'components';
@@ -351,6 +352,156 @@ const ApplicationSettings = () => {
             </Grid>
           </Grid>
         )}
+        <Typography color="secondary">eMail</Typography>
+        <BlockFormControlLabel
+          control={
+            <Checkbox
+              checked={data.email_enabled}
+              onChange={updateFormValue}
+              name="email_enabled"
+              disabled={!hardwareData.psram}
+            />
+          }
+          label={
+            <Typography color={!hardwareData.psram ? 'grey' : 'default'}>
+              Enable eMail notification
+              {!hardwareData.psram && (
+                <Typography variant="caption">
+                  &nbsp; &#40;{LL.IS_REQUIRED('PSRAM')}&#41;
+                </Typography>
+              )}
+            </Typography>
+          }
+        />
+        {data.email_enabled && (
+          <>
+            <Grid
+              container
+              spacing={2}
+              direction="row"
+              justifyContent="flex-start"
+              alignItems="flex-start"
+            >
+              <Grid>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  name="email_server"
+                  label="SMTP Server"
+                  variant="outlined"
+                  value={data.email_server}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+              <Grid>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  sx={{ width: '12ch' }}
+                  name="email_port"
+                  variant="outlined"
+                  label="Port"
+                  value={numberValue(data.email_port)}
+                  type="number"
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+              <Grid size={4} mt={!data.email_ssl && !data.email_starttls ? 0 : 3}>
+                {!data.email_starttls && (
+                  <BlockFormControlLabel
+                    sx={{ width: '12ch' }}
+                    control={
+                      <Checkbox
+                        checked={data.email_ssl}
+                        onChange={updateFormValue}
+                        name="email_ssl"
+                        disabled={
+                          data.email_starttls || data.email_ssl === undefined
+                        }
+                      />
+                    }
+                    label="SSL/TLS"
+                  />
+                )}
+                {!data.email_ssl && (
+                  <BlockFormControlLabel
+                    sx={{ width: '12ch' }}
+                    control={
+                      <Checkbox
+                        checked={data.email_starttls}
+                        onChange={updateFormValue}
+                        name="email_starttls"
+                        disabled={
+                          data.email_ssl || data.email_starttls === undefined
+                        }
+                      />
+                    }
+                    label="STARTTLS"
+                  />
+                )}
+              </Grid>
+            </Grid>
+            <Grid container spacing={2} rowSpacing={0}>
+              <Grid>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  name="email_login"
+                  label="Login"
+                  variant="outlined"
+                  value={data.email_login}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+              <Grid>
+                <ValidatedPasswordField
+                  fieldErrors={fieldErrors || {}}
+                  name="email_pass"
+                  label="Password"
+                  variant="outlined"
+                  value={data.email_pass}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+            </Grid>
+            <Grid container spacing={2} rowSpacing={0}>
+              <Grid>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  name="email_sender"
+                  label="From"
+                  variant="outlined"
+                  value={data.email_sender}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+              <Grid>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  name="email_recp"
+                  label="To"
+                  variant="outlined"
+                  value={data.email_recp}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+              <Grid>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  name="email_subject"
+                  label="Subject"
+                  variant="outlined"
+                  value={data.email_subject}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+            </Grid>
+          </>
+        )}
         <Typography sx={{ pb: 1, pt: 2 }} variant="h6" color="primary">
           {LL.SENSORS()}
         </Typography>
@@ -771,7 +922,7 @@ const ApplicationSettings = () => {
           label={LL.REMOTE_TIMEOUT_EN()}
         />
         {data.remote_timeout_en && (
-          <Box mt={2}>
+          <Box sx={{ mt: 2 }}>
             <ValidatedTextField
               fieldErrors={fieldErrors || {}}
               name="remote_timeout"

interface/src/app/settings/DownloadUpload.tsx

@@ -1,12 +1,23 @@
 import { useCallback, useMemo, useState } from 'react';
 import { toast } from 'react-toastify';
 
+import CancelIcon from '@mui/icons-material/Cancel';
 import DownloadIcon from '@mui/icons-material/GetApp';
-import { Box, Button, Grid, Typography } from '@mui/material';
+import WarningIcon from '@mui/icons-material/Warning';
+import {
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  Grid,
+  Typography
+} from '@mui/material';
 
 import * as SystemApi from 'api/system';
 import { API, callAction } from 'api/app';
 
+import { dialogStyle } from '@/CustomTheme';
 import { useRequest } from 'alova/client';
 import type { APIcall } from 'app/main/types';
 import SystemMonitor from 'app/status/SystemMonitor';
@@ -19,16 +30,11 @@ import {
 import { useI18nContext } from 'i18n/i18n-react';
 import { saveFile } from 'utils';
 
-interface DownloadButton {
-  key: string;
-  type: string;
-  label: string | number;
-  isGridButton: boolean;
-}
-
 const DownloadUpload = () => {
   const { LL } = useI18nContext();
 
+  const [confirmBackup, setConfirmBackup] = useState<boolean>(false);
+
   const [restarting, setRestarting] = useState<boolean>(false);
 
   const { send: sendExportData } = useRequest(
@@ -63,45 +69,50 @@ const DownloadUpload = () => {
 
   useLayoutTitle(LL.DOWNLOAD_UPLOAD());
 
-  const downloadButtons: DownloadButton[] = useMemo(
-    () => [
-      {
-        key: 'settings',
-        type: 'settings',
-        label: LL.SETTINGS_OF(LL.APPLICATION()),
-        isGridButton: true
-      },
-      {
-        key: 'customizations',
-        type: 'customizations',
-        label: LL.CUSTOMIZATIONS(),
-        isGridButton: true
-      },
-      {
-        key: 'entities',
-        type: 'entities',
-        label: LL.CUSTOM_ENTITIES(0),
-        isGridButton: true
-      },
-      {
-        key: 'schedule',
-        type: 'schedule',
-        label: LL.SCHEDULE(0),
-        isGridButton: true
-      },
-      {
-        key: 'allvalues',
-        type: 'allvalues',
-        label: LL.ALLVALUES(),
-        isGridButton: false
-      }
-    ],
-    [LL]
+  const handleCloseBackupDialog = useCallback(() => {
+    setConfirmBackup(false);
+  }, []);
+
+  const renderBackupDialog = useMemo(
+    () => (
+      <Dialog
+        sx={dialogStyle}
+        open={confirmBackup}
+        onClose={handleCloseBackupDialog}
+      >
+        <DialogTitle>{LL.DOWNLOAD_SYSTEM_BACKUP()}</DialogTitle>
+        <DialogContent dividers>
+          <WarningIcon color="warning" sx={{ fontSize: 18 }} />
+          &nbsp;
+          {LL.WARNING_SYSTEM_BACKUP()}
+        </DialogContent>
+        <DialogActions>
+          <Button
+            startIcon={<CancelIcon />}
+            variant="outlined"
+            onClick={handleCloseBackupDialog}
+            color="secondary"
+          >
+            {LL.CANCEL()}
+          </Button>
+          <Button
+            startIcon={<DownloadIcon />}
+            variant="outlined"
+            onClick={() => handleDownload('systembackup')()}
+            color="primary"
+          >
+            {LL.DOWNLOAD(0)}
+          </Button>
+        </DialogActions>
+      </Dialog>
+    ),
+    [confirmBackup, handleCloseBackupDialog, LL]
   );
 
   const handleDownload = useCallback(
     (type: string) => () => {
       void sendExportData(type);
+      setConfirmBackup(false);
     },
     [sendExportData]
   );
@@ -118,58 +129,57 @@ const DownloadUpload = () => {
     );
   }
 
-  const gridButtons = downloadButtons.filter((btn) => btn.isGridButton);
-  const standaloneButton = downloadButtons.find((btn) => !btn.isGridButton);
-
   return (
     <SectionContent>
+      {renderBackupDialog}
+
       <Typography sx={{ pb: 2 }} variant="h6" color="primary">
         {LL.DOWNLOAD(0)}
       </Typography>
 
-      <Typography mb={1} variant="body1" color="warning">
-        {LL.DOWNLOAD_SETTINGS_TEXT()}.
+      <Grid
+        container
+        spacing={2}
+        sx={{
+          alignItems: 'center'
+        }}
+      >
+        <Typography variant="body1" color="warning">
+          {LL.DOWNLOAD_SETTINGS_TEXT()}:
         </Typography>
-
-      <Grid container spacing={2}>
-        {gridButtons.map((button) => (
-          <Grid key={button.key}>
         <Button
           startIcon={<DownloadIcon />}
           variant="outlined"
           color="primary"
-              onClick={handleDownload(button.type)}
+          onClick={() => setConfirmBackup(true)}
         >
-              {button.label}
+          {LL.DOWNLOAD_SYSTEM_BACKUP()}
         </Button>
       </Grid>
-        ))}
-      </Grid>
 
-      <Typography mt={2} mb={1} variant="body1" color="warning">
-        {LL.DOWNLOAD_SETTINGS_TEXT2()}.
+      <Grid container spacing={2} sx={{ mt: 2, alignItems: 'center' }}>
+        <Typography variant="body1" color="warning">
+          {LL.DOWNLOAD_SETTINGS_TEXT2()}:
         </Typography>
-
-      {standaloneButton && (
         <Button
           startIcon={<DownloadIcon />}
           variant="outlined"
           color="primary"
-          onClick={handleDownload(standaloneButton.type)}
+          onClick={handleDownload('allvalues')}
         >
-          {standaloneButton.label}
+          {LL.ALLVALUES()}
         </Button>
-      )}
+      </Grid>
 
       <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
         {LL.UPLOAD()}
       </Typography>
 
-      <Box color="warning.main" sx={{ pb: 2 }}>
-        <Typography variant="body1">{LL.UPLOAD_TEXT()}.</Typography>
-      </Box>
+      <Typography sx={{ pb: 2 }} color="warning" variant="body1">
+        {LL.UPLOAD_TEXT()}:
+      </Typography>
 
-      <SingleUpload text={LL.UPLOAD_DRAG()} doRestart={doRestart} />
+      <SingleUpload doRestart={doRestart} />
     </SectionContent>
   );
 };

interface/src/app/settings/MqttSettings.tsx

@@ -129,7 +129,7 @@ const MqttSettings = () => {
     <SectionContent>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       <>
-        <Box display="flex" gap={2} mb={1}>
+        <Box sx={{ display: 'flex', gap: 2, mb: 1 }}>
           <BlockFormControlLabel
             control={
               <Checkbox

interface/src/app/settings/NTPSettings.tsx

@@ -193,9 +193,9 @@ const NTPSettings = () => {
           {timeZoneItems}
         </ValidatedTextField>
 
-        <Box display="flex" flexWrap="wrap">
+        <Box sx={{ display: 'flex', flexWrap: 'wrap' }}>
           {!data.enabled && !dirtyFlags.length && (
-            <Box flexWrap="nowrap" whiteSpace="nowrap">
+            <Box sx={{ flexWrap: 'nowrap', whiteSpace: 'nowrap' }}>
               <ButtonRow>
                 <Button
                   onClick={openSetTime}
@@ -259,9 +259,9 @@ const NTPSettings = () => {
       <Dialog sx={dialogStyle} open={settingTime} onClose={handleCloseSetTime}>
         <DialogTitle>{LL.SET_TIME(1)}</DialogTitle>
         <DialogContent dividers>
-          <Box color="warning.main" p={0} pl={0} pr={0} mt={0} mb={2}>
-            <Typography variant="body2">{LL.SET_TIME_TEXT()}</Typography>
-          </Box>
+          <Typography color="warning" variant="body2">
+            {LL.SET_TIME_TEXT()}
+          </Typography>
           <TextField
             label={LL.LOCAL_TIME(0)}
             type="datetime-local"

interface/src/app/settings/Settings.tsx

@@ -156,11 +156,13 @@ const Settings = () => {
         <Divider />
 
         <Box
-          mt={2}
-          display="flex"
-          justifyContent="flex-end"
-          flexWrap="nowrap"
-          whiteSpace="nowrap"
+          sx={{
+            mt: 2,
+            display: 'flex',
+            justifyContent: 'flex-end',
+            flexWrap: 'nowrap',
+            whiteSpace: 'nowrap'
+          }}
         >
           <Button
             startIcon={<SettingsBackupRestoreIcon />}

interface/src/app/settings/security/GenerateToken.tsx

@@ -54,19 +54,27 @@ const GenerateToken = ({ username, onClose }: GenerateTokenProps) => {
       <DialogContent dividers>
         {token ? (
           <>
-            <MessageBox message={LL.ACCESS_TOKEN_TEXT()} level="info" my={2} />
-            <Box mt={2} mb={2}>
+            <MessageBox
+              message={LL.ACCESS_TOKEN_TEXT()}
+              level="info"
+              sx={{ mt: 2, mb: 2 }}
+            />
+            <Box sx={{ mt: 2, mb: 2 }}>
               <TextField
                 label="Token"
                 multiline
                 value={token.token}
                 fullWidth
-                contentEditable={false}
+                slotProps={{
+                  input: {
+                    readOnly: true
+                  }
+                }}
               />
             </Box>
           </>
         ) : (
-          <Box m={4} textAlign="center">
+          <Box sx={{ m: 4, textAlign: 'center' }}>
             <LinearProgress />
             <Typography variant="h6">{LL.GENERATING_TOKEN()}&hellip;</Typography>
           </Box>

interface/src/app/settings/security/ManageUsers.tsx

@@ -240,12 +240,16 @@ const ManageUsers = () => {
         </Table>
 
         {noAdminConfigured() && (
-          <MessageBox level="warning" message={LL.USER_WARNING()} my={2} />
+          <MessageBox
+            level="warning"
+            message={LL.USER_WARNING()}
+            sx={{ mt: 2, mb: 2 }}
+          />
         )}
 
-        <Box display="flex" flexWrap="wrap">
+        <Box sx={{ display: 'flex', flexWrap: 'wrap' }}>
           {changed !== 0 && (
-            <Box flexGrow={1} sx={{ '& button': { mt: 2 } }}>
+            <Box sx={{ flexGrow: 1, '& button': { mt: 2 } }}>
               <ButtonRow>
                 <Button
                   startIcon={<CancelIcon />}
@@ -270,7 +274,7 @@ const ManageUsers = () => {
               </ButtonRow>
             </Box>
           )}
-          <Box flexWrap="nowrap" whiteSpace="nowrap">
+          <Box sx={{ flexWrap: 'nowrap', whiteSpace: 'nowrap' }}>
             <ButtonRow>
               <Button
                 startIcon={<PersonAddIcon />}

interface/src/app/status/SystemLog.tsx

@@ -38,8 +38,6 @@ import type { LogEntry, LogSettings } from 'types';
 import { LogLevel } from 'types';
 import { updateValueDirty, useRest } from 'utils';
 
-const MAX_LOG_ENTRIES = 1000; // Limit log entries to prevent memory issues
-
 const TextColors: Record<LogLevel, string> = {
   [LogLevel.ERROR]: '#ff0000', // red
   [LogLevel.WARNING]: '#ff0000', // red
@@ -200,10 +198,6 @@ const SystemLog = () => {
         }
       }
       const newLog = [...log, logentry];
-      // Limit log entries to prevent memory issues - only slice when necessary
-      if (newLog.length > MAX_LOG_ENTRIES) {
-        return newLog.slice(-MAX_LOG_ENTRIES);
-      }
       return newLog;
     });
   }, []);
@@ -272,7 +266,7 @@ const SystemLog = () => {
 
     return (
       <>
-        <Grid container spacing={2} alignItems="center">
+        <Grid container spacing={2} sx={{ alignItems: 'center' }}>
           <Grid>
             <TextField
               name="level"
@@ -308,6 +302,8 @@ const SystemLog = () => {
                 <MenuItem value={50}>50</MenuItem>
                 <MenuItem value={75}>75</MenuItem>
                 <MenuItem value={100}>100</MenuItem>
+                <MenuItem value={500}>500</MenuItem>
+                <MenuItem value={1000}>1000</MenuItem>
               </TextField>
             </Grid>
           )}

interface/src/app/status/SystemMonitor.tsx

@@ -60,18 +60,16 @@ const SystemMonitor = () => {
   const { statusMessage, isUploading, progressValue } = useMemo(() => {
     const status = data?.status;
 
-    let message = '';
-    if (status && status >= SystemStatusCodes.SYSTEM_STATUS_UPLOADING) {
-      message = LL.WAIT_FIRMWARE();
-    } else if (status === SystemStatusCodes.SYSTEM_STATUS_PENDING_RESTART) {
-      message = LL.APPLICATION_RESTARTING();
-    } else if (status === SystemStatusCodes.SYSTEM_STATUS_NORMAL) {
-      message = LL.RESTARTING_PRE();
-    } else if (status === SystemStatusCodes.SYSTEM_STATUS_ERROR_UPLOAD) {
-      message = 'Upload Failed';
-    } else {
-      message = LL.RESTARTING_POST();
-    }
+    const message =
+      status && status >= SystemStatusCodes.SYSTEM_STATUS_UPLOADING
+        ? LL.WAIT_FIRMWARE()
+        : status === SystemStatusCodes.SYSTEM_STATUS_PENDING_RESTART
+          ? LL.APPLICATION_RESTARTING()
+          : status === SystemStatusCodes.SYSTEM_STATUS_NORMAL
+            ? LL.RESTARTING_PRE()
+            : status === SystemStatusCodes.SYSTEM_STATUS_ERROR_UPLOAD
+              ? 'Upload Failed'
+              : LL.RESTARTING_POST();
 
     const uploading =
       status !== undefined && status >= SystemStatusCodes.SYSTEM_STATUS_UPLOADING;
@@ -120,17 +118,15 @@ const SystemMonitor = () => {
           p: 3
         }}
       >
-        <Box display="flex" alignItems="center" flexDirection="column">
+        <Box sx={{ display: 'flex', alignItems: 'center', flexDirection: 'column' }}>
           <img
             src="/app/icon.png"
             alt="EMS-ESP"
             style={{ width: '40px', height: '40px', marginBottom: '16px' }}
           />
           <Typography
-            color="secondary"
+            sx={{ color: 'secondary', fontWeight: 400, textAlign: 'center' }}
             variant="h6"
-            fontWeight={400}
-            textAlign="center"
           >
             {statusMessage}
           </Typography>
@@ -150,11 +146,14 @@ const SystemMonitor = () => {
             </MessageBox>
           ) : (
             <>
-              <Typography mt={2} variant="h6" fontWeight={400} textAlign="center">
+              <Typography
+                sx={{ mt: 2, fontWeight: 400, textAlign: 'center' }}
+                variant="h6"
+              >
                 {LL.PLEASE_WAIT()}&hellip;
               </Typography>
               {isUploading && (
-                <Box width="100%" pl={2} pr={2} py={2}>
+                <Box sx={{ width: '100%', pl: 2, pr: 2, py: 2 }}>
                   <LinearProgressWithLabel value={progressValue} />
                 </Box>
               )}

interface/src/app/status/Version.tsx

@@ -7,6 +7,7 @@ import {
   useRef,
   useState
 } from 'react';
+import { Link } from 'react-router';
 import { toast } from 'react-toastify';
 
 import CancelIcon from '@mui/icons-material/Cancel';
@@ -24,7 +25,6 @@ import {
   DialogTitle,
   Grid,
   IconButton,
-  Link,
   Table,
   TableBody,
   TableCell,
@@ -274,6 +274,7 @@ const InstallDialog = memo(
     fetchDevVersion,
     latestVersion,
     latestDevVersion,
+    upgradeImportantMessageType,
     downloadOnly,
     platform,
     LL,
@@ -284,6 +285,7 @@ const InstallDialog = memo(
     fetchDevVersion: boolean;
     latestVersion?: VersionInfo;
     latestDevVersion?: VersionInfo;
+    upgradeImportantMessageType: number;
     downloadOnly: boolean;
     platform: string;
     LL: TranslationFunctions;
@@ -307,12 +309,24 @@ const InstallDialog = memo(
           {`${LL.INSTALL()} ${fetchDevVersion ? LL.DEVELOPMENT() : LL.STABLE()} Firmware`}
         </DialogTitle>
         <DialogContent dividers>
-          <Typography mb={2}>
+          <Typography sx={{ mb: 2 }}>
             {LL.INSTALL_VERSION(
               downloadOnly ? LL.DOWNLOAD(1) : LL.INSTALL(),
               fetchDevVersion ? latestDevVersion?.name : latestVersion?.name
             )}
           </Typography>
+
+          {upgradeImportantMessageType === 1 && LL.UPGRADE_IMPORTANT_MESSAGES_1()}
+          {upgradeImportantMessageType === 2 && LL.UPGRADE_IMPORTANT_MESSAGES_2()}
+          <Typography sx={{ mt: 2 }}>
+            <Link
+              target="_blank"
+              to="https://docs.emsesp.org/FAQ#upgrading-the-firmware"
+              style={{ color: 'lightblue' }}
+            >
+              {LL.ONLINE_HELP()}
+            </Link>
+          </Typography>
         </DialogContent>
         <DialogActions>
           <Button
@@ -329,7 +343,12 @@ const InstallDialog = memo(
             onClick={onClose}
             color="primary"
           >
-            <Link underline="none" target="_blank" href={binURL} color="primary">
+            <Link
+              to={binURL}
+              target="_blank"
+              rel="noreferrer"
+              style={{ color: 'lightblue', textDecoration: 'none' }}
+            >
               {LL.DOWNLOAD(0)}
             </Link>
           </Button>
@@ -371,7 +390,9 @@ const InstallPartitionDialog = memo(
           {LL.INSTALL()} {LL.STORED_VERSIONS()}
         </DialogTitle>
         <DialogContent dividers>
-          <Typography mb={2}>{LL.INSTALL_VERSION(LL.INSTALL(), version)}</Typography>
+          <Typography sx={{ mb: 2 }}>
+            {LL.INSTALL_VERSION(LL.INSTALL(), version)}
+          </Typography>
         </DialogContent>
         <DialogActions>
           <Button
@@ -467,6 +488,26 @@ const Version = () => {
     immediate: false
   });
 
+  const [upgradeImportantMessageType, setUpgradeImportantMessageType] =
+    useState<number>(0);
+
+  const { send: checkUpgradeImportantMessages } = useRequest(
+    (version: string) =>
+      callAction({ action: 'upgradeImportantMessages', param: version }),
+    {
+      immediate: false
+    }
+  )
+    .onSuccess((event) => {
+      const upgradeImportantMessageType_n = (
+        event.data as { upgradeImportantMessageType: number }
+      ).upgradeImportantMessageType;
+      setUpgradeImportantMessageType(upgradeImportantMessageType_n);
+    })
+    .onError((error) => {
+      toast.error(String(error.error?.message || 'An error occurred'));
+    });
+
   // Memoized values
   const platform = useMemo(() => (data ? getPlatform(data) : ''), [data]);
 
@@ -532,10 +573,16 @@ const Version = () => {
     []
   );
 
-  const showFirmwareDialog = useCallback((useDevVersion: boolean) => {
+  const showFirmwareDialog = useCallback(
+    (useDevVersion: boolean) => {
       setFetchDevVersion(useDevVersion);
+      void checkUpgradeImportantMessages(
+        useDevVersion ? latestDevVersion?.name : latestVersion?.name
+      );
       setOpenInstallDialog(true);
-  }, []);
+    },
+    [latestDevVersion, latestVersion, fetchDevVersion]
+  );
 
   const closeInstallDialog = useCallback(() => {
     setOpenInstallDialog(false);
@@ -637,8 +684,8 @@ const Version = () => {
 
     return (
       <>
-        <Box p={2} border="1px solid grey" borderRadius={2}>
-          <Typography mb={1} variant="h6" color="primary">
+        <Box sx={{ p: 2, border: '1px solid #565656', borderRadius: 2 }}>
+          <Typography sx={{ mb: 1 }} variant="h6" color="primary">
             {LL.THIS_VERSION()}
           </Typography>
 
@@ -703,7 +750,7 @@ const Version = () => {
 
           {internetLive ? (
             <>
-              <Typography mt={4} mb={1} variant="h6" color="primary">
+              <Typography sx={{ mt: 4, mb: 1 }} variant="h6" color="primary">
                 {LL.AVAILABLE_VERSION()}
               </Typography>
 
@@ -725,7 +772,7 @@ const Version = () => {
                     </Grid>
                     <Grid size={{ xs: 8, md: 10 }}>
                       {otherPartitions.map((partition) => (
-                        <Typography key={partition.partition} mb={1}>
+                        <Typography key={partition.partition} sx={{ mb: 1 }}>
                           {partition.version}
                           <IconButton
                             onClick={() =>
@@ -791,7 +838,7 @@ const Version = () => {
               </Grid>
             </>
           ) : (
-            <Typography mt={2} color="warning">
+            <Typography sx={{ mt: 2 }} color="warning">
               <WarningIcon color="warning" sx={{ verticalAlign: 'middle', mr: 2 }} />
               {LL.INTERNET_CONNECTION_REQUIRED()}
             </Typography>
@@ -815,6 +862,7 @@ const Version = () => {
                 fetchDevVersion={fetchDevVersion}
                 latestVersion={latestVersion}
                 latestDevVersion={latestDevVersion}
+                upgradeImportantMessageType={upgradeImportantMessageType}
                 downloadOnly={downloadOnly}
                 platform={platform}
                 LL={LL}
@@ -832,7 +880,7 @@ const Version = () => {
               <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
                 {LL.UPLOAD()}
               </Typography>
-              <SingleUpload text={LL.UPLOAD_DROP_TEXT()} doRestart={doRestart} />
+              <SingleUpload doRestart={doRestart} />
             </>
           )}
         </Box>

interface/src/components/MessageBox.tsx

@@ -53,12 +53,16 @@ const MessageBox: FC<PropsWithChildren<MessageBoxProps>> = ({
 
   return (
     <Box
-      p={2}
-      display="flex"
-      alignItems="center"
-      borderRadius={1}
-      sx={{ backgroundColor, color: 'white', ...sx }}
       {...rest}
+      sx={{
+        display: 'flex',
+        alignItems: 'center',
+        borderRadius: 1,
+        backgroundColor,
+        color: 'white',
+        p: 2,
+        ...sx
+      }}
     >
       <Icon />
       {(message || children) && (

interface/src/components/layout/LayoutDrawer.tsx

@@ -29,7 +29,7 @@ const LayoutDrawerComponent = ({ mobileOpen, onClose }: LayoutDrawerProps) => {
     () => (
       <>
         <Toolbar disableGutters>
-          <Box display="flex" alignItems="center" px={2}>
+          <Box sx={{ display: 'flex', alignItems: 'center', p: 2 }}>
             <LayoutDrawerLogo src="/app/icon.png" alt={PROJECT_NAME} />
             <Typography variant="h6">{PROJECT_NAME}</Typography>
           </Box>

interface/src/components/layout/LayoutMenu.tsx

@@ -51,9 +51,7 @@ const LayoutMenuComponent = () => {
               sx={{ my: 0 }}
               slotProps={{
                 primary: {
-                  fontWeight: '600',
-                  mb: '2px',
-                  color: 'lightblue'
+                  sx: { fontWeight: 600, mb: '2px', color: 'lightblue' }
                 }
               }}
             />

interface/src/components/loading/FormLoader.tsx

@@ -32,8 +32,16 @@ const FormLoaderComponent = ({ errorMessage, onRetry }: FormLoaderProps) => {
     );
   }
   return (
-    <Box m={2} py={2} display="flex" alignItems="center" flexDirection="column">
-      <Box py={2}>
+    <Box
+      sx={{
+        m: 2,
+        py: 2,
+        display: 'flex',
+        alignItems: 'center',
+        flexDirection: 'column'
+      }}
+    >
+      <Box sx={{ p: 2 }}>
         <CircularProgress size={100} />
       </Box>
     </Box>

interface/src/components/loading/LoadingSpinner.tsx

@@ -15,12 +15,14 @@ const circularProgressStyles: SxProps<Theme> = (theme: Theme) => ({
 const LoadingSpinner = ({ height = '100%' }: LoadingSpinnerProps) => {
   return (
     <Box
-      display="flex"
-      alignItems="center"
-      justifyContent="center"
-      flexDirection="column"
-      padding={2}
-      height={height}
+      sx={{
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        flexDirection: 'column',
+        padding: 2,
+        height
+      }}
     >
       <CircularProgress sx={circularProgressStyles} size={100} />
     </Box>

interface/src/components/upload/DragNdrop.tsx

@@ -1,4 +1,4 @@
-// Code inspired by Prince Azubuike from https://medium.com/@dprincecoder/creating-a-drag-and-drop-file-upload-component-in-react-a-step-by-step-guide-4d93b6cc21e0
+// drag/drop code inspired by Prince Azubuike from https://medium.com/@dprincecoder/creating-a-drag-and-drop-file-upload-component-in-react-a-step-by-step-guide-4d93b6cc21e0
 import {
   type ChangeEvent,
   type DragEvent,
@@ -6,12 +6,28 @@ import {
   useRef,
   useState
 } from 'react';
+import { Link } from 'react-router';
+import { toast } from 'react-toastify';
 
 import CancelIcon from '@mui/icons-material/Cancel';
 import CloudUploadIcon from '@mui/icons-material/CloudUpload';
 import UploadIcon from '@mui/icons-material/Upload';
-import { Box, Button, Typography, styled } from '@mui/material';
+import WarningIcon from '@mui/icons-material/Warning';
+import {
+  Box,
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  Typography,
+  styled
+} from '@mui/material';
 
+import { callAction } from 'api/app';
+
+import { dialogStyle } from '@/CustomTheme';
+import { useRequest } from 'alova/client';
 import { useI18nContext } from 'i18n/i18n-react';
 
 const DocumentUploader = styled(Box)<{ active?: boolean }>(({ theme, active }) => ({
@@ -58,6 +74,29 @@ const DragNdrop = ({ text, onFileSelected }: DragNdropProps) => {
   const [dragged, setDragged] = useState(false);
   const inputRef = useRef<HTMLInputElement | null>(null);
   const { LL } = useI18nContext();
+  const [showUpgradeDialog, setShowUpgradeDialog] = useState(false);
+  const [upgradeImportantMessageType, setUpgradeImportantMessageType] =
+    useState<number>(0);
+
+  const { send: checkUpgradeImportantMessages } = useRequest(
+    (version: string) =>
+      callAction({ action: 'upgradeImportantMessages', param: version }),
+    {
+      immediate: false
+    }
+  )
+    .onSuccess((event) => {
+      const upgradeImportantMessageType_n = (
+        event.data as { upgradeImportantMessageType: number }
+      ).upgradeImportantMessageType;
+      setUpgradeImportantMessageType(upgradeImportantMessageType_n);
+      if (upgradeImportantMessageType_n === 0) {
+        onFileSelected(file);
+      }
+    })
+    .onError((error) => {
+      toast.error(String(error.error?.message || 'An error occurred'));
+    });
 
   const checkFileExtension = (file: File) => {
     const validExtensions = ['.json', '.bin', '.md5'];
@@ -97,9 +136,8 @@ const DragNdrop = ({ text, onFileSelected }: DragNdropProps) => {
 
   const handleUploadClick = (event: MouseEvent<HTMLButtonElement>) => {
     event.stopPropagation();
-    if (file) {
-      onFileSelected(file);
-    }
+    void checkUpgradeImportantMessages(file?.name || '');
+    setShowUpgradeDialog(true);
   };
 
   const handleBrowseClick = () => {
@@ -158,6 +196,56 @@ const DragNdrop = ({ text, onFileSelected }: DragNdropProps) => {
               {LL.UPLOAD()}
             </Button>
           </Box>
+          {showUpgradeDialog && upgradeImportantMessageType > 0 && (
+            <Dialog
+              sx={dialogStyle}
+              open={showUpgradeDialog}
+              onClose={() => setShowUpgradeDialog(false)}
+            >
+              <DialogTitle>
+                <WarningIcon
+                  color="warning"
+                  sx={{ fontSize: 18, verticalAlign: 'middle' }}
+                />
+                &nbsp;&nbsp;
+                {LL.UPGRADE_IMPORTANT_MESSAGES()}
+              </DialogTitle>
+              <DialogContent dividers>
+                {upgradeImportantMessageType === 2 &&
+                  LL.UPGRADE_IMPORTANT_MESSAGES_2()}
+                {upgradeImportantMessageType === 1 &&
+                  LL.UPGRADE_IMPORTANT_MESSAGES_1()}
+                <Typography sx={{ mt: 2 }}>
+                  <Link
+                    to="https://docs.emsesp.org/FAQ#upgrading-the-firmware"
+                    target="_blank"
+                    rel="noreferrer"
+                    style={{ color: 'lightblue' }}
+                  >
+                    {LL.ONLINE_HELP()}
+                  </Link>
+                </Typography>
+              </DialogContent>
+              <DialogActions>
+                <Button
+                  startIcon={<CancelIcon />}
+                  variant="outlined"
+                  onClick={() => setShowUpgradeDialog(false)}
+                  color="secondary"
+                >
+                  {LL.CANCEL()}
+                </Button>
+                <Button
+                  startIcon={<UploadIcon />}
+                  variant="outlined"
+                  onClick={() => onFileSelected(file)}
+                  color="primary"
+                >
+                  {LL.UPLOAD()}
+                </Button>
+              </DialogActions>
+            </Dialog>
+          )}
         </>
       )}
     </DocumentUploader>

interface/src/components/upload/SingleUpload.tsx

@@ -13,11 +13,10 @@ import DragNdrop from './DragNdrop';
 import { LinearProgressWithLabel } from './LinearProgressWithLabel';
 
 interface SingleUploadProps {
-  text: string;
   doRestart: () => void;
 }
 
-const SingleUpload = ({ text, doRestart }: SingleUploadProps) => {
+const SingleUpload = ({ doRestart }: SingleUploadProps) => {
   const [md5, setMd5] = useState<string>();
   const [file, setFile] = useState<File>();
   const { LL } = useI18nContext();
@@ -58,7 +57,7 @@ const SingleUpload = ({ text, doRestart }: SingleUploadProps) => {
     <>
       {isUploading ? (
         <>
-          <Box width="100%" pl={2} pr={2}>
+          <Box sx={{ width: '100%', pl: 2, pr: 2 }}>
             <LinearProgressWithLabel
               value={
                 progress.total === 0 || progress.loaded === 0
@@ -81,11 +80,11 @@ const SingleUpload = ({ text, doRestart }: SingleUploadProps) => {
           </Button>
         </>
       ) : (
-        <DragNdrop text={text} onFileSelected={setFile} />
+        <DragNdrop text={LL.UPLOAD_DROP_TEXT()} onFileSelected={setFile} />
       )}
 
       {md5 && (
-        <Box mt={2}>
+        <Box sx={{ mt: 2 }}>
           <Typography variant="body2">{'MD5: ' + md5}</Typography>
         </Box>
       )}

interface/src/i18n/cz/index.ts

@@ -186,7 +186,8 @@ const cz: Translation = {
   BUFFER_SIZE: 'Maximální velikost vyrovnávací paměti',
   COMPACT: 'Kompaktní',
   DOWNLOAD_SETTINGS_TEXT: 'Vytvořte zálohu svého nastavení a konfigurace',
-  DOWNLOAD_SETTINGS_TEXT2: 'Exportovat všechna data',
+  DOWNLOAD_SETTINGS_TEXT2: 'Exportovat všechny hodnoty',
+  DOWNLOAD_SYSTEM_BACKUP: 'Systémová záloha',
   UPLOAD_TEXT: 'Nahrajte nový soubor firmwaru (.bin) nebo záložní soubor (.json)',
   UPLOAD_DROP_TEXT: 'Přetáhněte soubor sem nebo klikněte pro výběr',
   ERROR: 'Neočekávaná chyba, zkuste to prosím znovu',
@@ -349,15 +350,22 @@ const cz: Translation = {
   NO_DATA_1: 'Nebyly nalezeny žádné oblíbené entity. Použijte modul',
   NO_DATA_2: 'pro jejich výběr.',
   NO_DATA_3: 'Pro zobrazení všech dostupných entit navštivte stránku',
+  NO_GPIO: 'Nebylo nalezeno žádné volné GPIO',
   THIS_VERSION: 'Tato verze',
   PLATFORM: 'Platforma',
   RELEASE_TYPE: 'Typ sestavení',
   INTERNET_CONNECTION_REQUIRED: 'Pro automatickou kontrolu a instalaci aktualizací je třeba internetové připojení',
   SWITCH_RELEASE_TYPE: 'Přepnout na {0} verzi',
   FIRMWARE_VERSION_INFO: 'Informace o verzi firmwaru',
-  NO_DATA: 'Žádná data',
+  NO_DATA: 'žádné údaje',
   USER_PROFILE: 'Uživatelský profil',
-  STORED_VERSIONS: 'Uložené verze'
+  STORED_VERSIONS: 'Uložené verze',
+  ONLINE_HELP: 'online nápověda',
+  UPGRADE_IMPORTANT_MESSAGES: 'Aktualizovat důležité zprávy',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Tato aktualizace vyžaduje obnovení továrního nastavení. Ujistěte se, že nejprve stáhnete systémovou zálohu před pokračováním a poté nahrajte tento soubor po instalaci nové verze.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujete se na novou hlavní verzi. Ujistěte se, že jste přečetli ChangeLog pro jakékoliv závažné změny.',
+  WARNING_SYSTEM_BACKUP: 'Toto vytvoří zálohu vašich celých systémových konfigurací a nastavení. Všechna hesla budou v zálohovém souboru čitelná. Buďte opatrní při sdílení! Opravdu chcete pokračovat?'
+
 };
 
 export default cz;

interface/src/i18n/de/index.ts

@@ -186,7 +186,8 @@ const de: Translation = {
   BUFFER_SIZE: 'Max. Puffergröße',
   COMPACT: 'Kompakte Darstellung',
   DOWNLOAD_SETTINGS_TEXT: 'Erstellen Sie eine Sicherung Ihrer Konfigurationen und Einstellungen',
-  DOWNLOAD_SETTINGS_TEXT2: 'Exportiere alle Daten',
+  DOWNLOAD_SETTINGS_TEXT2: 'Exportiere alle Werte',
+  DOWNLOAD_SYSTEM_BACKUP: 'System Sicherung',
   UPLOAD_TEXT: 'Laden Sie eine neue Firmware-Datei (.bin) oder eine Sicherungsdatei (.json) hoch',
   UPLOAD_DROP_TEXT: 'Legen Sie eine Firmware-Datei (.bin) ab oder klicken Sie hier',
   ERROR: 'Unerwarteter Fehler, bitte versuchen Sie es erneut.',
@@ -349,6 +350,7 @@ const de: Translation = {
   NO_DATA_1: 'Keine favorisierten EMS-Entitäten gefunden! Verwenden Sie das Modul',
   NO_DATA_2: ', um sie zu markieren.',
   NO_DATA_3: 'Um alle verfügbaren Entitäten anzuzeigen, gehen Sie zu',
+  NO_GPIO: 'Keine freien GPIO gefunden',
   THIS_VERSION: 'Diese Version',
   PLATFORM: 'Plattform',
   RELEASE_TYPE: 'Release Typ',
@@ -357,7 +359,13 @@ const de: Translation = {
   FIRMWARE_VERSION_INFO: 'Firmware-Versionsinformation',
   NO_DATA: 'Keine Daten',
   USER_PROFILE: 'Benutzerprofil',
-  STORED_VERSIONS: 'Gespeicherte Versionen'
+  STORED_VERSIONS: 'Gespeicherte Versionen',
+  ONLINE_HELP: 'Online-Hilfe',
+  UPGRADE_IMPORTANT_MESSAGES: 'Wichtige Nachrichten aktualisieren',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Diese Aktualisierung erfordert eine Werkseinstellung. Stellen Sie sicher, dass Sie zuerst eine Systemsicherung herunterladen, bevor Sie fortfahren, und laden Sie diese Datei dann nach der Installation der neuen Version hoch.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Sie aktualisieren auf eine neue Hauptversion. Stellen Sie sicher, dass Sie den ChangeLog für alle wichtigen Änderungen gelesen haben.',
+  WARNING_SYSTEM_BACKUP: 'Dies wird eine Sicherung Ihrer vollständigen Systemkonfiguration und -einstellungen erstellen. Alle Passwörter werden im Sicherungsdatei lesbar sein. Seien Sie vorsichtig beim Teilen! Möchten Sie fortfahren?'
+
 };
 
 export default de;

interface/src/i18n/en/index.ts

@@ -186,7 +186,8 @@ const en: Translation = {
   BUFFER_SIZE: 'Max Buffer Size',
   COMPACT: 'Compact',
   DOWNLOAD_SETTINGS_TEXT: 'Create a backup of your configuration and settings',
-  DOWNLOAD_SETTINGS_TEXT2: 'Export all data',
+  DOWNLOAD_SETTINGS_TEXT2: 'Export all values',
+  DOWNLOAD_SYSTEM_BACKUP: 'System Backup',
   UPLOAD_TEXT: 'Upload a new firmware file (.bin) or a backup file (.json)',
   UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here',
   ERROR: 'Unexpected Error, please try again',
@@ -349,6 +350,7 @@ const en: Translation = {
   NO_DATA_1: 'No favorite EMS entities found yet. Use the',
   NO_DATA_2: 'module to mark them.',
   NO_DATA_3: 'To see all available entities go to',
+  NO_GPIO: 'No available GPIO found',
   THIS_VERSION: 'This Version',
   PLATFORM: 'Platform',
   RELEASE_TYPE: 'Release Type',
@@ -357,7 +359,13 @@ const en: Translation = {
   FIRMWARE_VERSION_INFO: 'Firmware Version Information',
   NO_DATA: 'No data',
   USER_PROFILE: 'User Profile',
-  STORED_VERSIONS: 'Stored Versions'
+  STORED_VERSIONS: 'Stored Versions',
+  ONLINE_HELP: 'online help',
+  UPGRADE_IMPORTANT_MESSAGES: 'Upgrade Important Messages',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'This upgrade requires a factory reset. Make sure you first download a System Backup before continuing, and then upload this file after the new version is installed.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'You are upgrading to a new major version. Make sure you have read the ChangeLog for any breaking changes.',
+  WARNING_SYSTEM_BACKUP: 'This will create a backup of your full system configuration and settings. All passwords will be readable in the backup file. Be careful with sharing! Do you want to continue?'
+
 };
 
 export default en;

interface/src/i18n/fr/index.ts

@@ -186,7 +186,8 @@ const fr: Translation = {
   BUFFER_SIZE: 'Max taille du buffer',
   COMPACT: 'Compact',
   DOWNLOAD_SETTINGS_TEXT: 'Créer une sauvegarde de vos paramètres et configurations',
-  DOWNLOAD_SETTINGS_TEXT2: 'Exporter toutes les données',
+  DOWNLOAD_SETTINGS_TEXT2: 'Exporter toutes les valeurs',
+  DOWNLOAD_SYSTEM_BACKUP: 'Sauvegarde système',
   UPLOAD_TEXT: 'Télécharger un nouveau fichier firmware (.bin) ou une sauvegarde (.json)',
   UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here',
   ERROR: 'Erreur inattendue, veuillez réessayer',
@@ -349,6 +350,7 @@ const fr: Translation = {
   NO_DATA_1: 'Aucune entité EMS favorite trouvée. Utilisez le',
   NO_DATA_2: 'module pour les marquer.',
   NO_DATA_3: 'Pour voir toutes les entités disponibles, aller à',
+  NO_GPIO: "Aucun GPIO disponible n'a été détecté",
   THIS_VERSION: 'Cette version',
   PLATFORM: 'Plateforme',
   RELEASE_TYPE: 'Type de version',
@@ -357,7 +359,13 @@ const fr: Translation = {
   FIRMWARE_VERSION_INFO: 'Informations sur la version du firmware',
   NO_DATA: 'Aucune donnée',
   USER_PROFILE: 'Profil utilisateur',
-  STORED_VERSIONS: 'Versions stockées'
+  STORED_VERSIONS: 'Versions stockées',
+  ONLINE_HELP: 'aide en ligne',
+  UPGRADE_IMPORTANT_MESSAGES: 'Mettre à jour les messages importants',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Cette mise à jour nécessite une réinitialisation de fabrique. Assurez-vous de télécharger une sauvegarde système avant de continuer, et de la charger après l\'installation de la nouvelle version.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Vous mettez à jour vers une nouvelle version majeure. Assurez-vous de lire le ChangeLog pour tout changement important.',
+  WARNING_SYSTEM_BACKUP: 'Cela créera une sauvegarde de votre configuration et paramètres complets. Tous les mots de passe seront lisibles dans le fichier de sauvegarde. Soyez prudent avec le partage ! Voulez-vous continuer ?'
+
 };
 
 export default fr;

interface/src/i18n/it/index.ts

@@ -186,7 +186,8 @@ const it: Translation = {
   BUFFER_SIZE: 'Max Buffer Size',
   COMPACT: 'Compatto',
   DOWNLOAD_SETTINGS_TEXT: 'Create a backup of your configuration and settings',
-  DOWNLOAD_SETTINGS_TEXT2: 'Esporta tutti i dati',
+  DOWNLOAD_SETTINGS_TEXT2: 'Esporta tutti i valori',
+  DOWNLOAD_SYSTEM_BACKUP: 'Backup sistema',
   UPLOAD_TEXT: 'Upload a new firmware file (.bin) or a backup file (.json)',
   UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here',
   ERROR: 'Errore Inaspettato, prego tenta ancora',
@@ -349,6 +350,7 @@ const it: Translation = {
   NO_DATA_1: 'Nessuna entità EMS preferita trovata. Usa il',
   NO_DATA_2: 'modulo per marcarle.',
   NO_DATA_3: 'Per vedere tutte le entità disponibili vai a',
+  NO_GPIO: 'Non è stato trovato alcun GPIO disponibile',
   THIS_VERSION: 'Questa versione',
   PLATFORM: 'Piattaforma',
   RELEASE_TYPE: 'Tipo di rilascio',
@@ -357,7 +359,13 @@ const it: Translation = {
   FIRMWARE_VERSION_INFO: 'Informazioni sulla versione del firmware',
   NO_DATA: 'Nessun dato',
   USER_PROFILE: 'Profilo utente',
-  STORED_VERSIONS: 'Versioni memorizzate'
+  STORED_VERSIONS: 'Versioni memorizzate',
+  ONLINE_HELP: 'aiuto online',
+  UPGRADE_IMPORTANT_MESSAGES: 'Aggiorna Messaggi Importanti',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Questa aggiornamento richiede un ripristino di fabbrica. Assicurati di prima scaricare un backup del sistema prima di continuare, e poi caricare questo file dopo l\'installazione della nuova versione.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Stai aggiornando a una nuova versione principale. Assicurati di aver letto il ChangeLog per qualsiasi cambiamento importante.',
+  WARNING_SYSTEM_BACKUP: 'Questo creerà un backup delle tue configurazioni e impostazioni complete. Tutte le password saranno leggibili nel file di backup. Sei sicuro di voler continuare?'
+
 };
 
 export default it;

interface/src/i18n/nl/index.ts

@@ -27,7 +27,7 @@ const nl: Translation = {
   REFRESH: 'Ververs',
   EXPORT: 'Export',
   FAVORITES: "Favorieten",
-  DEVICE_DETAILS: 'Device Gegevens',
+  DEVICE_DETAILS: 'Apparaat Gegevens',
   ID_OF: '{0} ID',
   DEVICE: 'Apparaat',
   PRODUCT: 'Product',
@@ -65,7 +65,7 @@ const nl: Translation = {
   TEMP_SENSOR: 'Temperatuur sensor',
   TEMP_SENSORS: 'Temperatuur Sensoren',
   WRITE_CMD_SENT: 'Schrijf commando gestuurd',
-  EMS_BUS_WARNING: 'EMS bus niet gevonden. Als deze waarschuwing blijft staan na een paar seconden dan loop de instellingen na en in het bijzonder het apparaat type profiel na.',
+  EMS_BUS_WARNING: 'EMS bus niet gevonden. Als deze waarschuwing blijft staan na een paar seconden loop dan de instellingen na en in het bijzonder het apparaat type profiel.',
   EMS_BUS_SCANNING: 'Scannen naar EMS apparaten...',
   CONNECTED: 'Verbonden',
   TX_ISSUES: 'Tx bus probleem. Probeer een andere Tx verzendmodus',
@@ -75,7 +75,7 @@ const nl: Translation = {
   EMS_DEVICE: 'EMS Apparaat',
   SUCCESS: 'SUCCESS',
   FAIL: 'MISLUKT',
-  QUALITY: 'QUALITEIT',
+  QUALITY: 'KWALITEIT',
   SCAN: 'Scan',
   STATUS_NAMES: [
     'EMS Telegrammen ontvangen (Rx)',
@@ -120,7 +120,7 @@ const nl: Translation = {
   ENABLE_SHOWER_TIMER: 'Activeer Douche Timer (tijdmeting)',
   ENABLE_SHOWER_ALERT: 'Activeer Douchemelding',
   TRIGGER_TIME: 'Trigger tijd',
-  COLD_SHOT_DURATION: 'Tijd Shot koud water',
+  COLD_SHOT_DURATION: 'Lengte koud water puls',
   FORMATTING_OPTIONS: 'Formatteringsopties',
   BOOLEAN_FORMAT_DASHBOARD: 'Boolean formaat web',
   BOOLEAN_FORMAT_API: 'Boolean formaat API/MQTT',
@@ -143,7 +143,7 @@ const nl: Translation = {
   CUSTOMIZATIONS_FULL: 'Te veel entiteiten geselecteerd. Sla op in delen aub',
   CUSTOMIZATIONS_SAVED: 'Custom aanpassingen opgeslagen',
   CUSTOMIZATIONS_HELP_1: 'Selecteer een apparaat en pas de entiteiten aan door middel van de opties',
-  CUSTOMIZATIONS_HELP_2: 'Markeer as favoriet',
+  CUSTOMIZATIONS_HELP_2: 'Markeer als favoriet',
   CUSTOMIZATIONS_HELP_3: 'Zet schrijfacties uit',
   CUSTOMIZATIONS_HELP_4: 'Uitsluiten van MQTT en API',
   CUSTOMIZATIONS_HELP_5: 'verbergen voor apparaten',
@@ -186,12 +186,13 @@ const nl: Translation = {
   BUFFER_SIZE: 'Max buffer grootte',
   COMPACT: 'Compact',
   DOWNLOAD_SETTINGS_TEXT: 'Maak een back-up van uw configuratie en instellingen',
-  DOWNLOAD_SETTINGS_TEXT2: 'Exporteer alle data',
+  DOWNLOAD_SETTINGS_TEXT2: 'Exporteer alle waarden',
+  DOWNLOAD_SYSTEM_BACKUP: 'Systeem Backup',
   UPLOAD_TEXT: 'Upload een nieuw firmwarebestand (.bin) of een back-upbestand (.json)',
   UPLOAD_DROP_TEXT: 'Sleep en firmware .bin bestand hierheen of klik hier',
   ERROR: 'Onverwachte fout, probeer opnieuw',
   TIME_SET: 'Tijd ingesteld',
-  MANAGE_USERS: 'Beheer Gebruikers',
+  MANAGE_USERS: 'Gebruikersbeheer',
   IS_ADMIN: 'is Admin',
   USER_WARNING: 'U dient tenminste 1 admin gebruiker te configureren',
   ADD: 'Toevoegen',
@@ -200,7 +201,7 @@ const nl: Translation = {
   GENERATING_TOKEN: 'Token aan het genereren',
   USER: 'Gebruiker',
   MODIFY: 'Aanpassen',
-  SU_TEXT: 'Het su (super user) wachtwoord wordt gebruikt om authorisatie tokens te signeren en ook om admin privileges te activeren in de console.',
+  SU_TEXT: 'Het su (super user) wachtwoord wordt gebruikt om authorisatie tokens te ondertekenen en ook om admin privileges te activeren in de console.',
   NOT_ENABLED: 'Niet geactiveerd',
   ERRORS_OF: '{0} Foutmeldingen',
   DISCONNECT_REASON: 'Verbinding verbroken vanwege',
@@ -349,6 +350,7 @@ const nl: Translation = {
   NO_DATA_1: 'Er zijn nog geen favoriete EMS-entiteiten gevonden. Gebruik de',
   NO_DATA_2: 'module om ze te markeren.',
   NO_DATA_3: 'Om alle beschikbare entiteiten te zien, ga naar',
+  NO_GPIO: 'Er is geen beschikbare GPIO gevonden',
   THIS_VERSION: 'Deze Versie',
   PLATFORM: 'Platform',
   RELEASE_TYPE: 'Release Typ',
@@ -357,7 +359,13 @@ const nl: Translation = {
   FIRMWARE_VERSION_INFO: 'Informatie over firmwareversie',
   NO_DATA: 'Geen data',
   USER_PROFILE: 'Gebruikersprofiel',
-  STORED_VERSIONS: 'Opgeslagen versies'
+  STORED_VERSIONS: 'Opgeslagen versies',
+  ONLINE_HELP: 'online help',
+  UPGRADE_IMPORTANT_MESSAGES: 'Upgrade Belangrijke Berichten',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Deze upgrade vereist een fabrieksinstelling. Zorg ervoor dat u eerst een Systeem Backup download voordat u doorgaat, en upload deze file na de installatie van de nieuwe versie.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'U updatet naar een nieuwe grote versie. Zorg ervoor dat u de ChangeLog hebt gelezen voor alle brekende wijzigingen.',
+  WARNING_SYSTEM_BACKUP: 'Dit zal een back-up van uw volledige systeemconfiguratie en instellingen maken. Alle wachtwoorden zijn leesbaar in het back-upbestand. Wees voorzichtig bij delen! Wilt u doorgaan?'
+
 };
 
 export default nl;

interface/src/i18n/no/index.ts

@@ -186,7 +186,8 @@ const no: Translation = {
   BUFFER_SIZE: 'Max Buffer Størrelse',
   COMPACT: 'Komprimere',
   DOWNLOAD_SETTINGS_TEXT: 'Lag en sikkerhetskopi av dine konfigurasjon og innstillinger',
-  DOWNLOAD_SETTINGS_TEXT2: 'Eksporter alle data',
+  DOWNLOAD_SETTINGS_TEXT2: 'Eksporter alle verdier',
+  DOWNLOAD_SYSTEM_BACKUP: 'System Sikkerhetskopi',
   UPLOAD_TEXT: 'Last opp en ny firmware fil (.bin) eller en sikkerhetskopi fil (.json)',
   UPLOAD_DROP_TEXT: 'Dropp en firmware fil (.bin) eller klikk her',
   ERROR: 'Ukjent feil, prøv igjen',
@@ -349,6 +350,7 @@ const no: Translation = {
   NO_DATA_1: 'Ingen favoritte EMS enheter funnet enda. Bruk',
   NO_DATA_2: 'modul for å markere dem.',
   NO_DATA_3: 'For å se alle tilgjengelige enheter, gå til',
+  NO_GPIO: 'Det ble ikke funnet noen tilgjengelige GPIO-porter',
   THIS_VERSION: 'Denne versjonen',
   PLATFORM: 'Plattform',
   RELEASE_TYPE: 'Utgivelses type',
@@ -357,7 +359,13 @@ const no: Translation = {
   FIRMWARE_VERSION_INFO: 'Informasjon om firmwareversjon',
   NO_DATA: 'Ingen data',
   USER_PROFILE: 'Brukerprofil',
-  STORED_VERSIONS: 'Lagret versjoner'
+  STORED_VERSIONS: 'Lagret versjoner',
+  ONLINE_HELP: 'online hjelp',
+  UPGRADE_IMPORTANT_MESSAGES: 'Oppdater viktige meldinger',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Denne oppdateringen krever en fabriksinstilling. Sørg for at du først lastet ned en System Backup før du fortsetter, og last denne filen etter at den nye versjonen er installert.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Du oppdaterer til en ny hovedversjon. Sørg for at du har lest ChangeLog for eventuelle bruddende endringer.',
+  WARNING_SYSTEM_BACKUP: 'Dette vil lage en sikkerhetskopi av din fullstendige systemkonfigurasjon og innstillinger. Alle passord vil være lesbare i sikkerhetskopien. Vær forsiktig med deling! Vil du fortsette?'
+
 };
 
 export default no;

interface/src/i18n/pl/index.ts

@@ -186,7 +186,8 @@ const pl: BaseTranslation = {
   BUFFER_SIZE: 'Maksymalna pojemność bufora (ilość wpisów)',
   COMPACT: 'Kompaktowy',
   DOWNLOAD_SETTINGS_TEXT: 'Utwórz kopię swoich ustawień i konfiguracji',
-  DOWNLOAD_SETTINGS_TEXT2: 'Eksportuj wszystkie dane',
+  DOWNLOAD_SETTINGS_TEXT2: 'Eksportuj wszystkie wartości',
+  DOWNLOAD_SYSTEM_BACKUP: 'Kopia zapasowa systemu',
   UPLOAD_TEXT: 'Wgraj nowy plik firmware (.bin) lub kopię ustawień (.json)',
   UPLOAD_DROP_TEXT: 'Upuść plik firmware .bin lub kliknij tutaj',
   ERROR: 'Nieoczekiwany błąd, spróbuj ponownie!',
@@ -349,6 +350,7 @@ const pl: BaseTranslation = {
   NO_DATA_1: 'Brak ulubionych encji EMS. Użyj',
   NO_DATA_2: 'moduł do ich oznaczenia.',
   NO_DATA_3: 'Aby zobaczyć wszystkie dostępne encje przejdź do',
+  NO_GPIO: 'Nie znaleziono dostępnych pinów GPIO',
   THIS_VERSION: 'Ta wersja',
   PLATFORM: 'Platforma',
   RELEASE_TYPE: 'Typ wydania',
@@ -357,7 +359,13 @@ const pl: BaseTranslation = {
   FIRMWARE_VERSION_INFO: 'Informacje o wersji firmware',
   NO_DATA: 'Brak danych',
   USER_PROFILE: 'Profil użytkownika',
-  STORED_VERSIONS: 'Zapisane wersje'
+  STORED_VERSIONS: 'Zapisane wersje',
+  ONLINE_HELP: 'pomoc online',
+  UPGRADE_IMPORTANT_MESSAGES: 'Aktualizuj ważne wiadomości',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Ta aktualizacja wymaga resetu fabrycznego. Upewnij się, że najpierw pobierzesz kopię zapasową systemu przed kontynuowaniem, a następnie przesuń tę plik po zainstalowaniu nowej wersji.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujesz się do nowej głównej wersji. Upewnij się, że przeczytałeś ChangeLog dla wszelkich istotnych zmian.',
+  WARNING_SYSTEM_BACKUP: 'To spowoduje utworzenie kopii zapasowej całej konfiguracji i ustawień systemu. Wszystkie hasła będą widoczne w pliku kopii zapasowej. Bądź ostrożny przy udostępnianiu! Chcesz kontynuować?'
+
 };
 
 export default pl;

interface/src/i18n/sk/index.ts

@@ -4,7 +4,7 @@ const sk: Translation = {
   LANGUAGE: 'Jazyk',
   RETRY: 'Opakovať',
   LOADING: 'Načítanie',
-  IS_REQUIRED: '{0} je požadovaných',
+  IS_REQUIRED: '{0} je požadovaná',
   SIGN_IN: 'Prihlásiť sa',
   SIGN_OUT: 'Odhlásiť sa',
   USERNAME: 'Užívateľské meno',
@@ -186,7 +186,8 @@ const sk: Translation = {
   BUFFER_SIZE: 'Buffer-max. veľkosť',
   COMPACT: 'Kompaktné',
   DOWNLOAD_SETTINGS_TEXT: 'Vytvorte zálohu svojej konfigurácie a nastavení',
-  DOWNLOAD_SETTINGS_TEXT2: 'Exportovať všetky dáta',
+  DOWNLOAD_SETTINGS_TEXT2: 'Exportovať všetky hodnoty',
+  DOWNLOAD_SYSTEM_BACKUP: 'Systémová záloha',
   UPLOAD_TEXT: 'Nahrajte nový súbor firmvéru (.bin) alebo súbor zálohy (.json)',
   UPLOAD_DROP_TEXT: 'Presuňte súbor .bin firmvéru alebo kliknite sem',
   ERROR: 'Neočakávaná chyba, prosím skúste to znova',
@@ -275,11 +276,11 @@ const sk: Translation = {
   NETWORK_SUBNET: 'Maska podsiete',
   NETWORK_DNS: 'DNS servery',
   ADDRESS_OF: '{0} adresa',
-  ADMINISTRATOR: 'Administrator',
+  ADMINISTRATOR: 'Administrátor',
   GUEST: 'Hosť',
-  NEW: 'Nová',
+  NEW: 'Novú',
   NEW_NAME_OF: 'Nový názov {0}',
-  ENTITY: 'entita',
+  ENTITY: 'entitu',
   MIN: 'min',
   MAX: 'max',
   BLOCK_NAVIGATE_1: 'Máte neuložené zmeny',
@@ -349,6 +350,7 @@ const sk: Translation = {
   NO_DATA_1: 'Nenašli sa žiadne obľúbené entity EMS. Použite',
   NO_DATA_2: 'modul na ich označenie.',
   NO_DATA_3: 'Ak chcete zobraziť všetky dostupné entity, prejdite na',
+  NO_GPIO: 'Nebol nájdený žiadny dostupný GPIO',
   THIS_VERSION: 'Táto verzia',
   PLATFORM: 'Platforma',
   RELEASE_TYPE: 'Typ vydania',
@@ -357,7 +359,13 @@ const sk: Translation = {
   FIRMWARE_VERSION_INFO: 'Informácie o verzii firmware',
   NO_DATA: 'Žiadne dáta',
   USER_PROFILE: 'Profil používateľa',
-  STORED_VERSIONS: 'Uložené verzie'
+  STORED_VERSIONS: 'Uložené verzie',
+  ONLINE_HELP: 'online pomoc',
+  UPGRADE_IMPORTANT_MESSAGES: 'Aktualizovať dôležité správy',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Táto aktualizácia vyžaduje reštart základných nastavení. Uistite sa, že najprv stiahnete systémovú zálohu pred pokračovaním, a potom nahrajte tento súbor po instalácii novej verzie.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujete sa na novú hlavnú verziu. Uistite sa, že ste prečítali ChangeLog pre akékoľvek dôležité zmeny.',
+  WARNING_SYSTEM_BACKUP: 'Toto vytvorí zálohu všetkých vašich celých systémových konfigurácií a nastavení. Všetky hesla budú čitateľné v zálohovom súbore. Buďte opatrní pri zdieľaní! Chcete pokračovať?'
+
 };
 
 export default sk;

interface/src/i18n/sv/index.ts

@@ -186,7 +186,8 @@ const sv: Translation = {
   BUFFER_SIZE: 'Max bufferstorlek',
   COMPACT: 'Komprimerad',
   DOWNLOAD_SETTINGS_TEXT: 'Skapa en säkerhetskopia av din konfiguration och inställningar',
-  DOWNLOAD_SETTINGS_TEXT2: 'Exportera alla data',
+  DOWNLOAD_SETTINGS_TEXT2: 'Exportera alla värden',
+  DOWNLOAD_SYSTEM_BACKUP: 'System säkerhetskopia',
   UPLOAD_TEXT: 'Ladda upp en ny firmwarefil (.bin) eller en säkerhetskopiafil (.json)',
   UPLOAD_DROP_TEXT: 'Droppa en firmware .bin fil eller klicka här',
   ERROR: 'Okänt fel, var god försök igen',
@@ -349,6 +350,7 @@ const sv: Translation = {
   NO_DATA_1: 'Inga favorit EMS enheter hittade än. Använd',
   NO_DATA_2: 'modul för att markera dem.',
   NO_DATA_3: 'För att se alla tillgängliga enheter, gå till',
+  NO_GPIO: 'Inga tillgängliga GPIO-portar hittades',
   THIS_VERSION: 'Denna version',
   PLATFORM: 'Plattform',
   RELEASE_TYPE: 'Utgivelsestyp',
@@ -357,7 +359,13 @@ const sv: Translation = {
   FIRMWARE_VERSION_INFO: 'Information om firmwareversion',
   NO_DATA: 'Ingen data',
   USER_PROFILE: 'Användarprofil',
-  STORED_VERSIONS: 'Lagrad versioner'
+  STORED_VERSIONS: 'Lagrad versioner',
+  ONLINE_HELP: 'online hjälp',
+  UPGRADE_IMPORTANT_MESSAGES: 'Uppdatera viktiga meddelanden',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Denna uppdatering kräver en fabriksåterställning. Se till att du först laddar ned en System Backup innan du fortsätter, och ladda upp denna fil efter att den nya versionen är installerad.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Du uppdaterar till en ny huvudversion. Se till att du har läst ChangeLog för eventuella brkande ändringar.',
+  WARNING_SYSTEM_BACKUP: 'Detta kommer att skapa en säkerhetskopia av din fullständiga systemkonfiguration och inställningar. Alla lösenord kommer att vara läsbara i säkerhetskopien. Var försiktig med att dela! Vill du fortsätta?'
+
 };
 
 export default sv;

interface/src/i18n/tr/index.ts

@@ -186,7 +186,8 @@ const tr: Translation = {
   BUFFER_SIZE: 'En fazla bellek boyutu',
   COMPACT: 'Sıkışık',
   DOWNLOAD_SETTINGS_TEXT: 'Yapılandırma ve ayarlarınızın yedekleme yapın',
-  DOWNLOAD_SETTINGS_TEXT2: 'Tüm verileri dışarı al',
+  DOWNLOAD_SETTINGS_TEXT2: 'Tüm değerleri dışarı al',
+  DOWNLOAD_SYSTEM_BACKUP: 'Sistem yedekleme',
   UPLOAD_TEXT: 'Yeni bir firmware dosyası (.bin) veya yedek dosyası (.json) yükle',
   UPLOAD_DROP_TEXT: 'Bir firmware .bin dosyası veya buraya tıklayın',
   ERROR: 'Beklenemedik hata, lütfen tekrar deneyin.',
@@ -349,6 +350,7 @@ const tr: Translation = {
   NO_DATA_1: 'Henüz bir favori EMS varlığı bulunamadı. Kullanın',
   NO_DATA_2: 'modülünü kullanın.',
   NO_DATA_3: 'Tüm kullanılabilir varlıkları görmek için git',
+  NO_GPIO: 'Kullanılabilir GPIO bulunamadı',
   THIS_VERSION: 'Bu Sürüm',
   PLATFORM: 'Platforma',
   RELEASE_TYPE: 'Sürüm Tipi',
@@ -357,7 +359,13 @@ const tr: Translation = {
   FIRMWARE_VERSION_INFO: 'Firmware Sürüm Bilgisi',
   NO_DATA: 'Hiçbir veri yok',
   USER_PROFILE: 'Kullanıcı Profili',
-  STORED_VERSIONS: 'Kaydedilmiş Sürümler'
+  STORED_VERSIONS: 'Kaydedilmiş Sürümler',
+  ONLINE_HELP: 'online yardım',
+  UPGRADE_IMPORTANT_MESSAGES: 'Önemli Mesajları Güncelle',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Bu güncelleme továrnı ayarlarını gerektirir. Yapılandırmanızı ve ayarlarınızı önce yedekleyin ve ardından yeni sürüm yüklendikten sonra yükleyin.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Yeni bir büyük sürüme yükselteceksiniz. Değişiklikleri ChangeLogı okuduğunuzdan emin olun.',
+  WARNING_SYSTEM_BACKUP: 'Bu, sistem yapılandırmanızı ve ayarlarınızın bir yedeklemesi oluşturacaktır. Tüm şifreler yedekleme dosyasında okunabilir olacaktır. Paylaşırken dikkatli olun! Devam etmek istediğinize emin misiniz?'
+
 };
 
 export default tr;

interface/src/utils/file.ts

@@ -23,6 +23,8 @@ export const saveFile = (
     }, 100);
   } catch (error) {
     console.error('Failed to save file:', error);
-    throw new Error(`Unable to save file: ${filename}${extension}`);
+    throw new Error(`Unable to save file: ${filename}${extension}`, {
+      cause: error
+    });
   }
 };

interface/src/utils/useInterval.ts

@@ -1,6 +1,6 @@
 import { useEffect, useRef } from 'react';
 
-const DEFAULT_DELAY = 3000;
+const DEFAULT_DELAY = 5000;
 
 /**
  * Custom hook for setting up an interval with proper cleanup

interface/vite.config.ts

@@ -2,9 +2,8 @@ import preact from '@preact/preset-vite';
 import fs from 'fs';
 import path from 'path';
 import { visualizer } from 'rollup-plugin-visualizer';
-import { Plugin, defineConfig } from 'vite';
+import { Plugin, PluginOption, defineConfig } from 'vite';
 import viteImagemin from 'vite-plugin-imagemin';
-import viteTsconfigPaths from 'vite-tsconfig-paths';
 import zlib from 'zlib';
 
 // @ts-expect-error - mock server doesn't have type declarations
@@ -16,7 +15,7 @@ const REPEAT_CHAR = '=';
 const REPEAT_COUNT = 50;
 const DEFAULT_OUT_DIR = 'dist';
 const ES_TARGET = 'es2020';
-const CHUNK_SIZE_WARNING_LIMIT = 512;
+const CHUNK_SIZE_WARNING_LIMIT = 1024;
 const ASSETS_INLINE_LIMIT = 4096;
 
 // Common resolve aliases
@@ -99,16 +98,31 @@ const createPreactPlugin = (devToolsEnabled: boolean) =>
     prefreshEnabled: false
   });
 
+// Patch preact/compat to export stub React 19 APIs (use, useOptimistic) so that
+// react-router v7 doesn't trigger IMPORT_IS_UNDEFINED warnings from Rolldown.
+const preactCompatPatchPlugin = (): Plugin => ({
+  name: 'preact-compat-react19-patch',
+  transform(code, id) {
+    if (id.includes('preact') && id.includes('compat.module.js')) {
+      return {
+        code:
+          code +
+          '\nexport var use = undefined;\nexport var useOptimistic = undefined;\n',
+        map: null
+      };
+    }
+    return undefined;
+  }
+});
+
 // Common base plugins
 const createBasePlugins = (
   devToolsEnabled: boolean,
   includeBundleReporter = true
-) => {
-  const plugins = [
+): PluginOption[] => {
+  const plugins: PluginOption[] = [
     createPreactPlugin(devToolsEnabled),
-    viteTsconfigPaths({
-      projects: ['./tsconfig.json']
-    })
+    preactCompatPatchPlugin()
   ];
   if (includeBundleReporter) {
     plugins.push(bundleSizeReporter());
@@ -116,41 +130,10 @@ const createBasePlugins = (
   return plugins;
 };
 
-// Manual chunk splitting strategy
-const createManualChunks = (detailed = false) => {
-  return (id: string): string | undefined => {
-    if (id.includes('node_modules')) {
-      if (id.includes('preact')) return '@preact';
-      if (detailed) {
-        if (id.includes('react-router')) return '@react-router';
-        if (id.includes('@mui/material')) return '@mui-material';
-        if (id.includes('@mui/icons-material')) return '@mui-icons';
-        if (id.includes('alova')) return '@alova';
-        if (id.includes('typesafe-i18n')) return '@i18n';
-        if (id.includes('react-toastify')) return '@toastify';
-        if (id.includes('@table-library')) return '@table-library';
-        if (id.includes('uuid')) return '@uuid';
-        if (id.includes('axios') || id.includes('fetch')) return '@http';
-        if (id.includes('lodash') || id.includes('ramda')) return '@utils';
-      }
-      return 'vendor';
-    }
-    if (detailed) {
-      // Group circularly dependent modules together to avoid circular chunk warnings
-      // components, app, and utils are tightly coupled, so combine them
-      if (
-        id.includes('components/') ||
-        id.includes('app/') ||
-        id.includes('utils/')
-      ) {
-        return 'app';
-      }
-      // Keep api separate as it's typically more independent
-      if (id.includes('api/')) return 'api';
-    }
+const manualChunks = (id: string): string | undefined => {
+  if (id.includes('node_modules')) return 'vendor';
   return undefined;
 };
-};
 
 // Common build base configuration
 const createBaseBuildConfig = () => ({
@@ -234,7 +217,8 @@ export default defineConfig(
         plugins: [...createBasePlugins(true, true), mockServer()],
         resolve: {
           alias: RESOLVE_ALIASES,
-          extensions: RESOLVE_EXTENSIONS
+          extensions: RESOLVE_EXTENSIONS,
+          tsconfigPaths: true
         },
         server: {
           open: true,
@@ -263,7 +247,8 @@ export default defineConfig(
         plugins: createBasePlugins(false, true),
         resolve: {
           alias: RESOLVE_ALIASES,
-          extensions: RESOLVE_EXTENSIONS
+          extensions: RESOLVE_EXTENSIONS,
+          tsconfigPaths: true
         },
         build: {
           ...createBaseBuildConfig(),
@@ -274,7 +259,7 @@ export default defineConfig(
               moduleSideEffects: false
             },
             output: {
-              manualChunks: createManualChunks(false)
+              manualChunks
             }
           }
         }
@@ -297,7 +282,8 @@ export default defineConfig(
       ],
       resolve: {
         alias: RESOLVE_ALIASES,
-        extensions: RESOLVE_EXTENSIONS
+        extensions: RESOLVE_EXTENSIONS,
+        tsconfigPaths: true
       },
       build: {
         ...createBaseBuildConfig(),
@@ -306,15 +292,14 @@ export default defineConfig(
         rollupOptions: {
           treeshake: {
             moduleSideEffects: false,
-            propertyReadSideEffects: false,
-            tryCatchDeoptimization: false,
+            propertyReadSideEffects: false as const,
             unknownGlobalSideEffects: false
           },
           output: {
             chunkFileNames: 'assets/[name]-[hash].js',
             entryFileNames: 'assets/[name]-[hash].js',
             assetFileNames: 'assets/[name]-[hash].[ext]',
-            manualChunks: createManualChunks(true),
+            manualChunks,
             sourcemap: false
           }
         }

lib/OneWire/OneWire.h

@@ -148,9 +148,7 @@
 #elif defined(ARDUINO_ARCH_ESP32)
 #include <driver/rtc_io.h>
 #include <soc/gpio_struct.h>
-#if ESP_IDF_VERSION_MAJOR >= 5
 #include "soc/gpio_periph.h"
-#endif // ESP_IDF_VERSION_MAJOR >= 5
 #define PIN_TO_BASEREG(pin) (0)
 #define PIN_TO_BITMASK(pin) (pin)
 #define IO_REG_TYPE uint32_t

lib/esp32-psram/src/esp32-psram.h

@@ -12,7 +12,9 @@
 // Include all library components
 #include "esp32-psram/AllocatorPSRAM.h"   // PSRAM-backed vector
 #include "esp32-psram/VectorPSRAM.h"   // PSRAM-backed vector
-#include "esp32-psram/VectorHIMEM.h"   // HIMEM-backed vector
+#if CONFIG_IDF_TARGET_ESP32
+#include "esp32-psram/VectorHIMEM.h"   // HIMEM-backed vector (ESP32 only)
+#endif
 // #include "esp32-psram/InMemoryFile.h"    // File interface using vectors
 // #include "esp32-psram/PSRAM.h"         // PSRAM file system
 // #include "esp32-psram/HIMEM.h"         // HIMEM file system

lib/esp32-psram/src/esp32-psram/HimemBlock.h

@@ -1,5 +1,8 @@
 #pragma once
 
+// HIMEM is only available on original ESP32
+#if CONFIG_IDF_TARGET_ESP32
+
 #include <algorithm>
 #include <limits>
 #include <memory>
@@ -360,3 +363,5 @@ class HimemBlock {
 };
 
 }  // namespace esp32_psram
+
+#endif  // CONFIG_IDF_TARGET_ESP32

lib/esp32-psram/src/esp32-psram/RingBufferStream.h

@@ -238,7 +238,9 @@ using RingBufferStreamPSRAM = RingBufferStream<VectorPSRAM<uint8_t>>;
 /**
  * @brief Type alias for a RingBufferStream that uses HIMEM-backed vector storage
  */
+#if CONFIG_IDF_TARGET_ESP32
 using RingBufferStreamHIMEM = RingBufferStream<VectorHIMEM<uint8_t>>;
+#endif
 
 /**
  * @brief Type alias for a RingBufferStream that uses std::vector storage

lib/esp32-psram/src/esp32-psram/TypedRingBuffer.h

@@ -209,8 +209,10 @@ using TypedRingBufferRAM = TypedRingBuffer<T, std::vector<T>>;
 /**
  * @brief Type alias for a typed ring buffer that uses HIMEM-backed vector storage
  */
+#if CONFIG_IDF_TARGET_ESP32
 template<typename T>
 using TypedRingBufferHIMEM = TypedRingBuffer<T, VectorHIMEM<T>>;
+#endif
 
 /**
  * @brief Type alias for a typed ring buffer that uses PSRAM-backed vector storage

lib/esp32-psram/src/esp32-psram/VectorHIMEM.h

@@ -1,5 +1,8 @@
 #pragma once
 
+// HIMEM is only available on original ESP32
+#if CONFIG_IDF_TARGET_ESP32
+
 #include "HimemBlock.h"
 
 namespace esp32_psram {
@@ -527,3 +530,5 @@ void swap(VectorHIMEM<T>& lhs, VectorHIMEM<T>& rhs) noexcept {
 }
 
 }  // namespace esp32_psram
+
+#endif  // CONFIG_IDF_TARGET_ESP32

lib/espMqttClient/src/Config.h

@@ -49,6 +49,10 @@ the LICENSE file.
 #define EMC_CLIENTID_LENGTH 23 + 1
 #endif
 
+#ifdef EMSESP_MQTT_STACKSIZE
+#define EMC_TASK_STACK_SIZE EMSESP_MQTT_STACKSIZE
+#endif
+
 #ifndef EMC_TASK_STACK_SIZE
 #define EMC_TASK_STACK_SIZE 5120
 #endif
@@ -73,7 +77,3 @@ the LICENSE file.
 #define EMC_SIZE_POOL_ELEMENTS 128
 #endif
 #endif
-
-#ifndef  TASMOTA_SDK
-#define EMC_CLIENT_SECURE
-#endif

lib/espMqttClient/src/MqttClient.cpp

@@ -62,14 +62,19 @@ MqttClient::MqttClient(espMqttClientTypes::UseInternalTask useInternalTask, uint
   _xSemaphore = xSemaphoreCreateMutex();
   EMC_SEMAPHORE_GIVE();  // release before first use
   if (_useInternalTask == espMqttClientTypes::UseInternalTask::YES) {
+    if (core > 1) {
+      xTaskCreate((TaskFunction_t)_loop, "mqttclient", EMC_TASK_STACK_SIZE, this, priority, &_taskHandle);
+    } else {
       xTaskCreatePinnedToCore((TaskFunction_t)_loop, "mqttclient", EMC_TASK_STACK_SIZE, this, priority, &_taskHandle, core);
     }
+  }
 #else
   (void) useInternalTask;
   (void) priority;
   (void) core;
 #endif
   _clientId = _generatedClientId;
+  _core = core;
 }
 
 MqttClient::~MqttClient() {

lib/espMqttClient/src/MqttClient.h

@@ -69,6 +69,16 @@ class MqttClient {
   const char* getClientId() const;
   size_t queueSize();  // No const because of mutex
   void loop();
+  uint32_t stack() {
+#ifndef EMSESP_STANDALONE
+   return uxTaskGetStackHighWaterMark(_taskHandle);
+#else
+    return 0;
+#endif
+  }
+  uint8_t core() {
+   return  _core;
+  }
     
  protected:
   explicit MqttClient(espMqttClientTypes::UseInternalTask useInternalTask, uint8_t priority = 1, uint8_t core = 1);
@@ -98,6 +108,7 @@ class MqttClient {
   uint8_t _willQos;
   bool _willRetain;
   uint32_t _timeout;
+  uint8_t _core;
 
   // state is protected to allow state changes by the transport system, defined in child classes
   // eg. to allow AsyncTCP

lib/espMqttClient/src/Transport/ClientPosix.cpp

@@ -8,7 +8,7 @@ the LICENSE file.
 
 #include "ClientPosix.h"
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__APPLE__)
 
 namespace espMqttClientInternals {
 

lib/espMqttClient/src/Transport/ClientPosix.h

@@ -8,7 +8,7 @@ the LICENSE file.
 
 #pragma once
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__APPLE__)
 
 #include <stdio.h>
 #include <stdlib.h>

lib/espMqttClient/src/Transport/ClientSecureSync.cpp

@@ -6,28 +6,31 @@ For a copy, see <https://opensource.org/licenses/MIT> or
 the LICENSE file.
 */
 
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#ifndef NO_TLS_SUPPORT
 
 #include "ClientSecureSync.h"
-#include <lwip/sockets.h>  // socket options
+#include <lwip/sockets.h>
+#include "../Config.h"
 
 namespace espMqttClientInternals {
 
 ClientSecureSync::ClientSecureSync()
     : client() {
-  // empty
+    client.setClient(&basic_client, true);
+    client.setBufferSizes(EMC_RX_BUFFER_SIZE, EMC_TX_BUFFER_SIZE);
+    client.setSessionTimeout(120); // Set the timeout in seconds (>=120 seconds)
+}
+
+ClientSecureSync::~ClientSecureSync() {
+    stop();
 }
 
 bool ClientSecureSync::connect(IPAddress ip, uint16_t port) {
     bool ret = client.connect(ip, port); // implicit conversion of return code int --> bool
     if (ret) {
-    #if defined(ARDUINO_ARCH_ESP8266)
-    client.setNoDelay(true);
-    #elif defined(ARDUINO_ARCH_ESP32)
         // Set TCP option directly to bypass lack of working setNoDelay for WiFiClientSecure
         int val = true;
-    client.setSocketOption(IPPROTO_TCP, TCP_NODELAY, &val, sizeof(int));
-    #endif
+        basic_client.setSocketOption(IPPROTO_TCP, TCP_NODELAY, &val, sizeof(int));
     }
     return ret;
 }
@@ -35,13 +38,9 @@ bool ClientSecureSync::connect(IPAddress ip, uint16_t port) {
 bool ClientSecureSync::connect(const char * host, uint16_t port) {
     bool ret = client.connect(host, port); // implicit conversion of return code int --> bool
     if (ret) {
-    #if defined(ARDUINO_ARCH_ESP8266)
-    client.setNoDelay(true);
-    #elif defined(ARDUINO_ARCH_ESP32)
         // Set TCP option directly to bypass lack of working setNoDelay for WiFiClientSecure
         int val = true;
-    client.setSocketOption(IPPROTO_TCP, TCP_NODELAY, &val, sizeof(int));
-    #endif
+        basic_client.setSocketOption(IPPROTO_TCP, TCP_NODELAY, &val, sizeof(int));
     }
     return ret;
 }

lib/espMqttClient/src/Transport/ClientSecureSync.h

@@ -8,15 +8,11 @@ the LICENSE file.
 
 #pragma once
 
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#ifndef NO_TLS_SUPPORT
 
-// Added for EMS-ESP
-#include "../Config.h"
-#if defined(EMC_CLIENT_SECURE)
-#include <WiFiClientSecure.h> // includes IPAddress
-#else
+// #include "esp_tls.h"
 #include <WiFiClient.h>
-#endif
+#include <ESP_SSLClient.h>
 #include "Transport.h"
 
 namespace espMqttClientInternals {
@@ -24,6 +20,7 @@ namespace espMqttClientInternals {
 class ClientSecureSync : public Transport {
   public:
     ClientSecureSync();
+    ~ClientSecureSync();
     bool   connect(IPAddress ip, uint16_t port) override;
     bool   connect(const char * host, uint16_t port) override;
     size_t write(const uint8_t * buf, size_t size) override;
@@ -31,12 +28,9 @@ class ClientSecureSync : public Transport {
     void   stop() override;
     bool   connected() override;
     bool   disconnected() override;
-    // added for EMS-ESP
-#if defined(EMC_CLIENT_SECURE)
-    WiFiClientSecure client;
-#else
-    WiFiClient client;
-#endif
+
+    WiFiClient    basic_client;
+    ESP_SSLClient client;
 };
 
 } // namespace espMqttClientInternals

lib/espMqttClient/src/espMqttClient.cpp

@@ -8,50 +8,6 @@ the LICENSE file.
 
 #include "espMqttClient.h"
 
-#if defined(ARDUINO_ARCH_ESP8266)
-espMqttClient::espMqttClient()
-    : MqttClientSetup(espMqttClientTypes::UseInternalTask::NO)
-    , _client() {
-    _transport = &_client;
-}
-
-espMqttClientSecure::espMqttClientSecure()
-    : MqttClientSetup(espMqttClientTypes::UseInternalTask::NO)
-    , _client() {
-    _transport = &_client;
-}
-
-espMqttClientSecure & espMqttClientSecure::setInsecure() {
-    _client.client.setInsecure();
-    return *this;
-}
-
-espMqttClientSecure & espMqttClientSecure::setFingerprint(const uint8_t fingerprint[20]) {
-    _client.client.setFingerprint(fingerprint);
-    return *this;
-}
-
-espMqttClientSecure & espMqttClientSecure::setTrustAnchors(const X509List * ta) {
-    _client.client.setTrustAnchors(ta);
-    return *this;
-}
-
-espMqttClientSecure & espMqttClientSecure::setClientRSACert(const X509List * cert, const PrivateKey * sk) {
-    _client.client.setClientRSACert(cert, sk);
-    return *this;
-}
-
-espMqttClientSecure & espMqttClientSecure::setClientECCert(const X509List * cert, const PrivateKey * sk, unsigned allowed_usages, unsigned cert_issuer_key_type) {
-    _client.client.setClientECCert(cert, sk, allowed_usages, cert_issuer_key_type);
-    return *this;
-}
-
-espMqttClientSecure & espMqttClientSecure::setCertStore(CertStoreBase * certStore) {
-    _client.client.setCertStore(certStore);
-    return *this;
-}
-#endif
-
 #if defined(ARDUINO_ARCH_ESP32)
 espMqttClient::espMqttClient(espMqttClientTypes::UseInternalTask useInternalTask)
     : MqttClientSetup(useInternalTask)
@@ -78,51 +34,45 @@ espMqttClientSecure::espMqttClientSecure(uint8_t priority, uint8_t core)
 }
 
 espMqttClientSecure & espMqttClientSecure::setInsecure() {
-#if defined(EMC_CLIENT_SECURE)
+#ifndef NO_TLS_SUPPORT
     _client.client.setInsecure();
 #endif
     return *this;
 }
 
 espMqttClientSecure & espMqttClientSecure::setCACert(const char * rootCA) {
-#if defined(EMC_CLIENT_SECURE)
+#ifndef NO_TLS_SUPPORT
     _client.client.setCACert(rootCA);
 #endif
     return *this;
 }
 
 espMqttClientSecure & espMqttClientSecure::setCertificate(const char * clientCa) {
-#if defined(EMC_CLIENT_SECURE)
+#ifndef NO_TLS_SUPPORT
     _client.client.setCertificate(clientCa);
 #endif
     return *this;
 }
 
 espMqttClientSecure & espMqttClientSecure::setPrivateKey(const char * privateKey) {
-#if defined(EMC_CLIENT_SECURE)
+#ifndef NO_TLS_SUPPORT
     _client.client.setPrivateKey(privateKey);
 #endif
     return *this;
 }
 
 espMqttClientSecure & espMqttClientSecure::setPreSharedKey(const char * pskIdent, const char * psKey) {
-#if defined(EMC_CLIENT_SECURE)
-    _client.client.setPreSharedKey(pskIdent, psKey);
+#ifndef NO_TLS_SUPPORT
 #endif
     return *this;
 }
 
 #endif
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__APPLE__)
 espMqttClient::espMqttClient()
     : MqttClientSetup(espMqttClientTypes::UseInternalTask::NO)
     , _client() {
     _transport = &_client;
 }
-#elif defined(_WIN32) || defined(__APPLE__)
-// Windows
-espMqttClient::espMqttClient()
-    : MqttClientSetup(espMqttClientTypes::UseInternalTask::NO) {
-}
 #endif

lib/espMqttClient/src/espMqttClient.h

@@ -14,7 +14,7 @@ the LICENSE file.
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
 #include "Transport/ClientSync.h"
 #include "Transport/ClientSecureSync.h"
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
 #include "Transport/ClientPosix.h"
 #endif
 
@@ -65,10 +65,16 @@ class espMqttClientSecure : public MqttClientSetup<espMqttClientSecure> {
     espMqttClientSecure & setPreSharedKey(const char * pskIdent, const char * psKey);
 
   protected:
+#ifndef NO_TLS_SUPPORT
     espMqttClientInternals::ClientSecureSync _client;
+#else
+    espMqttClientInternals::ClientSync _client;
+#endif
 };
 
-#elif defined(__linux__)
+#endif
+
+#if defined(__linux__) || defined(__APPLE__)
 class espMqttClient : public MqttClientSetup<espMqttClient> {
   public:
     espMqttClient();
@@ -76,10 +82,4 @@ class espMqttClient : public MqttClientSetup<espMqttClient> {
   protected:
     espMqttClientInternals::ClientPosix _client;
 };
-#elif defined(_WIN32) || defined(__APPLE__)
-class espMqttClient : public MqttClientSetup<espMqttClient> {
-  public:
-    espMqttClient();
-};
-
 #endif

lib/semver/LICENSE

@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Marko Živanović
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-

lib/semver/README.md

@@ -1,7 +0,0 @@
-# About
-
-This project is MIT-licensed, C++14 implementation of [semantic versioning](http://semver.org) parser and comparator with support for modifying parsed version strings. Semantic versioning 2.0.0 specification is supported out-of-the-box and the code should be flexible-enough to support future revisions or other similar versioning schemes.
-
-Copyright (c) 2015 Marko Zivanovic
-
-Based on https://github.com/zmarko/semver

lib/semver/Semver200_comparator.cpp

@@ -1,121 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2015 Marko Zivanovic
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include <algorithm>
-#include <functional>
-#include <map>
-#include "semver200.h"
-
-using namespace std;
-
-namespace version {
-
-namespace {
-
-// Compare normal version identifiers.
-int compare_normal(const Version_data & l, const Version_data & r) {
-    if (l.major > r.major)
-        return 1;
-    if (l.major < r.major)
-        return -1;
-    if (l.minor > r.minor)
-        return 1;
-    if (l.minor < r.minor)
-        return -1;
-    if (l.patch > r.patch)
-        return 1;
-    if (l.patch < r.patch)
-        return -1;
-    return 0;
-}
-
-// Compare alphanumeric prerelease identifiers.
-inline int cmp_alnum_prerel_ids(const string & l, const string & r) {
-    auto cmp = l.compare(r);
-    if (cmp == 0) {
-        return cmp;
-    } else {
-        return cmp > 0 ? 1 : -1;
-    }
-}
-
-// Compare numeric prerelease identifiers.
-inline int cmp_num_prerel_ids(const string & l, const string & r) {
-    long long li = stoll(l);
-    long long ri = stoll(r);
-    if (li == ri)
-        return 0;
-    return li > ri ? 1 : -1;
-}
-
-using Prerel_type_pair                                        = pair<Id_type, Id_type>;
-using Prerel_id_comparator                                    = function<int(const string &, const string &)>;
-const map<Prerel_type_pair, Prerel_id_comparator> comparators = {{{Id_type::alnum, Id_type::alnum}, cmp_alnum_prerel_ids},
-                                                                 {{Id_type::alnum, Id_type::num}, [](const string &, const string &) { return 1; }},
-                                                                 {{Id_type::num, Id_type::alnum}, [](const string &, const string &) { return -1; }},
-                                                                 {{Id_type::num, Id_type::num}, cmp_num_prerel_ids}};
-
-// Compare prerelease identifiers based on their types.
-inline int compare_prerel_identifiers(const Prerelease_identifier & l, const Prerelease_identifier & r) {
-    auto cmp = comparators.at({l.second, r.second});
-    return cmp(l.first, r.first);
-}
-
-inline int cmp_rel_prerel(const Prerelease_identifiers & l, const Prerelease_identifiers & r) {
-    if (l.empty() && !r.empty())
-        return 1;
-    if (r.empty() && !l.empty())
-        return -1;
-    return 0;
-}
-} // namespace
-
-int Semver200_comparator::compare(const Version_data & l, const Version_data & r) const {
-    // Compare normal version components.
-    int cmp = compare_normal(l, r);
-    if (cmp != 0)
-        return cmp;
-
-    // Compare if one version is release and the other prerelease - release is always higher.
-    cmp = cmp_rel_prerel(l.prerelease_ids, r.prerelease_ids);
-    if (cmp != 0)
-        return cmp;
-
-    // Compare prerelease by looking at each identifier: numeric ones are compared as numbers,
-    // alphanum as ASCII strings.
-    auto shorter = min(l.prerelease_ids.size(), r.prerelease_ids.size());
-    for (size_t i = 0; i < shorter; i++) {
-        cmp = compare_prerel_identifiers(l.prerelease_ids[i], r.prerelease_ids[i]);
-        if (cmp != 0)
-            return cmp;
-    }
-
-    // Prerelease identifiers are the same, to the length of the shorter version string;
-    // if they are the same length, then versions are equal, otherwise, longer one wins.
-    if (l.prerelease_ids.size() == r.prerelease_ids.size())
-        return 0;
-    return l.prerelease_ids.size() > r.prerelease_ids.size() ? 1 : -1;
-}
-
-} // namespace version

lib/semver/Semver200_parser.cpp

@@ -1,187 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2015 Marko Zivanovic
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include <functional>
-#include <map>
-#include "semver200.h"
-
-using namespace std;
-
-namespace version {
-
-namespace {
-enum class Parser_state { major, minor, patch, prerelease, build };
-
-using Validator             = function<void(const string &, const char)>;
-using State_transition_hook = function<void(string &)>;
-/// State transition is described by a character that triggers it, a state to transition to and
-/// optional hook to be invoked on transition.
-using Transition    = tuple<const char, Parser_state, State_transition_hook>;
-using Transitions   = vector<Transition>;
-using State         = tuple<Transitions, string &, Validator>;
-using State_machine = std::map<Parser_state, State>;
-
-// Ranges of characters allowed in prerelease and build identifiers.
-const vector<pair<char, char>> allowed_prerel_id_chars = {{'0', '9'}, {'A', 'Z'}, {'a', 'z'}, {'-', '-'}};
-
-inline Transition mkx(const char c, Parser_state p, State_transition_hook pth) {
-    return make_tuple(c, p, pth);
-}
-
-inline void Parse_error(const std::string & s) {
-    // EMSESP::logger().err("parse error: %s", s.c_str());
-}
-
-/// Advance parser state machine by a single step.
-/**
-		Perform single step of parser state machine: if character matches one from transition tables -
-		trigger transition to next state; otherwise, validate if current token is in legal state
-		(throw Parse_error if not) and then add character to current token; State transition includes
-		preparing various vars for next state and invoking state transition hook (if specified) which is
-		where whole tokens are validated.
-		*/
-inline void process_char(const char c, Parser_state & cstate, Parser_state & pstate, const Transitions & transitions, string & target, Validator validate) {
-    for (const auto & transition : transitions) {
-        if (c == get<0>(transition)) {
-            if (get<2>(transition))
-                get<2>(transition)(target);
-            pstate = cstate;
-            cstate = get<1>(transition);
-            return;
-        }
-    }
-    validate(target, c);
-    target.push_back(c);
-}
-
-/// Validate normal (major, minor, patch) version components.
-inline void normal_version_validator(const string & tgt, const char c) {
-    if (c < '0' || c > '9')
-        Parse_error("invalid character encountered: " + string(1, c));
-    if (tgt.compare(0, 1, "0") == 0)
-        Parse_error("leading 0 not allowed");
-}
-
-/// Validate that prerelease and build version identifiers are comprised of allowed chars only.
-inline void prerelease_version_validator(const string &, const char c) {
-    bool res = false;
-    for (const auto & r : allowed_prerel_id_chars) {
-        res |= (c >= r.first && c <= r.second);
-    }
-    if (!res)
-        Parse_error("invalid character encountered: " + string(1, c));
-}
-
-inline bool is_identifier_numeric(const string & id) {
-    return id.find_first_not_of("0123456789") == string::npos;
-}
-
-inline bool check_for_leading_0(const string & str) {
-    return str.length() > 1 && str[0] == '0';
-}
-
-/// Validate every individual prerelease identifier, determine it's type and add it to collection.
-void prerelease_hook_impl(string & id, Prerelease_identifiers & prerelease) {
-    if (id.empty())
-        Parse_error("version identifier cannot be empty");
-    Id_type t = Id_type::alnum;
-    if (is_identifier_numeric(id)) {
-        t = Id_type::num;
-        if (check_for_leading_0(id)) {
-            Parse_error("numeric identifiers cannot have leading 0");
-        }
-    }
-    prerelease.push_back(Prerelease_identifier(id, t));
-    id.clear();
-}
-
-/// Validate every individual build identifier and add it to collection.
-void build_hook_impl(string & id, Parser_state & pstate, Build_identifiers & build, std::string & prerelease_id, Prerelease_identifiers & prerelease) {
-    // process last token left from parsing prerelease data
-    if (pstate == Parser_state::prerelease)
-        prerelease_hook_impl(prerelease_id, prerelease);
-    if (id.empty())
-        Parse_error("version identifier cannot be empty");
-    build.push_back(id);
-    id.clear();
-}
-
-} // namespace
-
-/// Parse semver 2.0.0-compatible string to Version_data structure.
-/**
-	Version text parser is implemented as a state machine. In each step one successive character from version
-	string is consumed and is either added to current token or triggers state transition. Hooks can be
-	injected into state transitions for validation/customization purposes.
-	*/
-Version_data Semver200_parser::parse(const string & s) const {
-    string                 major;
-    string                 minor;
-    string                 patch;
-    string                 prerelease_id;
-    string                 build_id;
-    Prerelease_identifiers prerelease;
-    Build_identifiers      build;
-    Parser_state           cstate{Parser_state::major};
-    Parser_state           pstate;
-
-    auto prerelease_hook = [&](string & id) { prerelease_hook_impl(id, prerelease); };
-
-    auto build_hook = [&](string & id) { build_hook_impl(id, pstate, build, prerelease_id, prerelease); };
-
-    // State transition tables
-    auto major_trans      = {mkx('.', Parser_state::minor, {})};
-    auto minor_trans      = {mkx('.', Parser_state::patch, {})};
-    auto patch_trans      = {mkx('-', Parser_state::prerelease, {}), mkx('+', Parser_state::build, {})};
-    auto prerelease_trans = {// When identifier separator (.) is found, stay in the same state but invoke hook
-                             // in order to process each individual identifier separately.
-                             mkx('.', Parser_state::prerelease, prerelease_hook),
-                             mkx('+', Parser_state::build, {})};
-    auto build_trans = {// Same stay-in-the-same-state-but-invoke-hook trick from above.
-                        mkx('.', Parser_state::build, build_hook)};
-
-    State_machine state_machine = {{Parser_state::major, State{major_trans, major, normal_version_validator}},
-                                   {Parser_state::minor, State{minor_trans, minor, normal_version_validator}},
-                                   {Parser_state::patch, State{patch_trans, patch, normal_version_validator}},
-                                   {Parser_state::prerelease, State{prerelease_trans, prerelease_id, prerelease_version_validator}},
-                                   {Parser_state::build, State{build_trans, build_id, prerelease_version_validator}}};
-
-    // Main loop.
-    for (const auto & c : s) {
-        auto state = state_machine.at(cstate);
-        process_char(c, cstate, pstate, get<0>(state), get<1>(state), get<2>(state));
-    }
-
-    // Trigger appropriate hooks in order to process last token, because no state transition was
-    // triggered for it.
-    if (cstate == Parser_state::prerelease) {
-        prerelease_hook(prerelease_id);
-    } else if (cstate == Parser_state::build) {
-        build_hook(build_id);
-    }
-
-    return Version_data{stoi(major), stoi(minor), stoi(patch), prerelease, build};
-}
-
-} // namespace version

lib/semver/semver200.h

@@ -1,53 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2015 Marko Zivanovic
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#pragma once
-
-#include "version.h"
-
-namespace version {
-
-/// Parse string into Version_data structure according to semantic versioning 2.0.0 rules.
-struct Semver200_parser {
-    Version_data parse(const std::string &) const;
-};
-
-/// Compare Version_data to another using semantic versioning 2.0.0 rules.
-struct Semver200_comparator {
-    int compare(const Version_data &, const Version_data &) const;
-};
-
-/// Concrete version class that binds all semver 2.0.0 functionality together.
-class Semver200_version : public Basic_version<Semver200_parser, Semver200_comparator> {
-  public:
-    Semver200_version()
-        : Basic_version{Semver200_parser(), Semver200_comparator()} {
-    }
-
-    Semver200_version(const std::string & v)
-        : Basic_version{v, Semver200_parser(), Semver200_comparator()} {
-    }
-};
-
-} // namespace version

lib/semver/version.h

@@ -1,149 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2015 Marko Zivanovic
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#pragma once
-
-#include <string>
-#include <vector>
-
-namespace version {
-
-/// Type of prerelease identifier: alphanumeric or numeric.
-/**
-	Type of identifier affects comparison: alphanumeric identifiers are compared as ASCII strings, while
-	numeric identifiers are compared as numbers.
-	*/
-enum class Id_type {
-    alnum, ///< Identifier is alphanumerical
-    num    ///< Identifier is numeric
-};
-
-/// Container for prerelease identifier value and it's type.
-/**
-	Prerelease version string consist of an optional series of dot-separated identifiers.
-	These identifiers can be either numerical or alphanumerical.
-	This structure describes one such identifier.
-	*/
-using Prerelease_identifier = std::pair<std::string, Id_type>;
-
-/// Container for all prerelease identifiers for a given version string.
-using Prerelease_identifiers = std::vector<Prerelease_identifier>;
-
-/// Build identifier is arbitrary string with no special meaning with regards to version precedence.
-using Build_identifier = std::string;
-
-/// Container for all build identifiers of a given version string.
-using Build_identifiers = std::vector<Build_identifier>;
-
-/// Description of version broken into parts, as per semantic versioning specification.
-struct Version_data {
-    Version_data(const int M, const int m, const int p, const Prerelease_identifiers & pr, const Build_identifiers & b)
-        : major{M}
-        , minor{m}
-        , patch{p}
-        , prerelease_ids{pr}
-        , build_ids{b} {
-    }
-
-    int major; ///< Major version, change only on incompatible API modifications.
-    int minor; ///< Minor version, change on backwards-compatible API modifications.
-    int patch; ///< Patch version, change only on bugfixes.
-
-    /// Optional series of prerelease identifiers.
-    Prerelease_identifiers prerelease_ids;
-
-    /// Optional series of build identifiers.
-    Build_identifiers build_ids;
-};
-
-// Forward declaration required for operators' template declarations.
-template <typename Parser, typename Comparator>
-class Basic_version;
-
-/// Test if left-hand version operand is of lower precedence than the right-hand version.
-template <typename Parser, typename Comparator>
-bool operator<(const Basic_version<Parser, Comparator> &, const Basic_version<Parser, Comparator> &);
-
-/// Test if left-hand version operand if of equal precedence as the right-hand version.
-template <typename Parser, typename Comparator>
-bool operator==(const Basic_version<Parser, Comparator> &, const Basic_version<Parser, Comparator> &);
-
-/// Test if left-hand version and right-hand version are of different precedence.
-template <typename Parser, typename Comparator>
-bool operator!=(const Basic_version<Parser, Comparator> &, const Basic_version<Parser, Comparator> &);
-
-/// Test if left-hand version operand is of higher precedence than the right-hand version.
-template <typename Parser, typename Comparator>
-bool operator>(const Basic_version<Parser, Comparator> &, const Basic_version<Parser, Comparator> &);
-
-/// Test if left-hand version operand is of higher or equal precedence as the right-hand version.
-template <typename Parser, typename Comparator>
-bool operator>=(const Basic_version<Parser, Comparator> &, const Basic_version<Parser, Comparator> &);
-
-/// Test if left-hand version operand is of lower or equal precedence as the right-hand version.
-template <typename Parser, typename Comparator>
-bool operator<=(const Basic_version<Parser, Comparator> &, const Basic_version<Parser, Comparator> &);
-
-/// Base class for various version parsing, precedence ordering and data manipulation schemes.
-/**
-	Basic_version class describes general version object without prescribing parsing,
-	validation, comparison and modification rules. These rules are implemented by supplied Parser, Comparator
-	and Modifier objects.
-	*/
-template <typename Parser, typename Comparator>
-class Basic_version {
-  public:
-    /// Construct Basic_version object using Parser object to parse default ("0.0.0") version string, Comparator for comparison and Modifier for modification.
-    Basic_version(Parser, Comparator);
-
-    /// Construct Basic_version object using Parser to parse supplied version string, Comparator for comparison and Modifier for modification.
-    Basic_version(const std::string &, Parser, Comparator);
-
-    /// Construct Basic_version object using supplied Version_data, Parser, Comparator and Modifier objects.
-    Basic_version(const Version_data &, Parser, Comparator);
-
-    /// Construct Basic_version by copying data from another one.
-    Basic_version(const Basic_version &);
-
-    /// Copy version data from another Basic_version to this one.
-    Basic_version & operator=(const Basic_version &);
-
-    int               major() const;      ///< Get major version.
-    int               minor() const;      ///< Get minor version.
-    int               patch() const;      ///< Get patch version.
-    const std::string prerelease() const; ///< Get prerelease version string.
-    const std::string build() const;      ///< Get build version string.
-
-    friend bool operator< <>(const Basic_version &, const Basic_version &);
-    friend bool operator==<>(const Basic_version &, const Basic_version &);
-
-  private:
-    Parser       parser_;
-    Comparator   comparator_;
-    Version_data ver_;
-};
-
-} // namespace version
-
-#include "version.inl"