Merge pull request #3045 from MichaelDvP/dev

fix legegram length, #2969

.github/workflows/dev_release.yml

@@ -28,7 +28,7 @@ jobs:
           node-version: 24
 
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
   
       - name: Enable Corepack
         run: corepack enable pnpm
@@ -47,7 +47,7 @@ jobs:
 
       - name: Build webUI
         run: |
-          platformio run -e build_webUI
+          platformio run -e build-webUI
 
       - name: Build modbus
         run: |
@@ -62,13 +62,13 @@ jobs:
           platformio run
 
       - name: Commit the generated files
-        uses: stefanzweifel/git-auto-commit-action@v5
+        uses: stefanzweifel/git-auto-commit-action@v7
         with:
           commit_message: "chore: update generated files for v${{steps.build_info.outputs.VERSION}}"
 
       - name: Create GitHub Release
         id: 'automatic_releases'
-        uses: emsesp/action-automatic-releases@v1.0.0
+        uses: emsesp/action-automatic-releases@v1.0.1
         with:
           repo_token: '${{ secrets.GITHUB_TOKEN }}'
           title: Development Build v${{steps.build_info.outputs.VERSION}}

.github/workflows/github-releases-to-discord.yml

@@ -11,7 +11,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         
       - name: GitHub Releases To Discord
         uses: SethCohen/github-releases-to-discord@v1.13.1

.github/workflows/pr_check.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install python 3.13
         uses: actions/setup-python@v6

.github/workflows/sonar_check.yml

@@ -19,7 +19,7 @@ jobs:
       BUILD_WRAPPER_OUT_DIR: bw-output
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Install Build Wrapper

.github/workflows/stable_release.yml

@@ -26,7 +26,7 @@ jobs:
           node-version: 24
 
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
   
       - name: Enable Corepack
         run: corepack enable pnpm
@@ -39,7 +39,7 @@ jobs:
 
       - name: Build webUI
         run: |
-          platformio run -e build_webUI
+          platformio run -e build-webUI
 
       - name: Build modbus
         run: |
@@ -54,7 +54,7 @@ jobs:
           platformio run
 
       - name: Create GitHub Release
-        uses: emsesp/action-automatic-releases@v1.0.0
+        uses: emsesp/action-automatic-releases@v1.0.1
         with:
           repo_token: '${{ secrets.GITHUB_TOKEN }}'
           prerelease: false

.github/workflows/test_release.yml

@@ -28,7 +28,7 @@ jobs:
           node-version: 24
 
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Enable Corepack
         run: corepack enable pnpm
@@ -47,7 +47,7 @@ jobs:
 
       - name: Build webUI
         run: |
-          platformio run -e build_webUI
+          platformio run -e build-webUI
 
       - name: Build modbus
         run: |
@@ -63,7 +63,7 @@ jobs:
 
       - name: Create GitHub Release
         id: 'automatic_releases'
-        uses: emsesp/action-automatic-releases@v1.0.0
+        uses: emsesp/action-automatic-releases@v1.0.1
         with:
           repo_token: '${{ secrets.GITHUB_TOKEN }}'
           title: Test Build v${{steps.build_info.outputs.VERSION}}

CHANGELOG_LATEST.md

@@ -12,13 +12,14 @@ For more details go to [emsesp.org](https://emsesp.org/).
 - 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)
+- custom entities check fetch length
 
 ## Changed
 
@@ -30,7 +31,6 @@ For more details go to [emsesp.org](https://emsesp.org/).
 - 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,8 +47,8 @@ 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

boards/c3_mini_4M.json

@@ -5,7 +5,7 @@
       },
       "core": "esp32",
       "extra_flags": [
-        "-DNO_TLS_SUPPORT",
+        "-DTASMOTA_SDK",
         "-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",
-        "-DNO_TLS_SUPPORT",
+        "-DTASMOTA_SDK",
         "-DARDUINO_USB_CDC_ON_BOOT=1",
         "-DARDUINO_USB_MODE=0"
       ],

boards/s3_32M_P.json

@@ -21,7 +21,7 @@
       "arduino",
       "espidf"
     ],
-    "name": "Tasmota ESP32-S3 32M Flash OPI PSRAM, 4608KB Code/OTA, 2MB FS",
+    "name": "Espressif 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": "-DNO_TLS_SUPPORT",
+      "extra_flags": "-DTASMOTA_SDK",
       "f_cpu": "240000000L",
       "f_flash": "40000000L",
       "flash_mode": "dio",
@@ -19,7 +19,7 @@
       "arduino",
       "espidf"
     ],
-    "name": "Tasmota ESP32 16M Flash, 4608KB Code/OTA, 2MB FS",
+    "name": "Espressif 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": "Tasmota ESP32 16M Flash DIO PSRAM, 4608KB Code/OTA, 2MB FS",
+    "name": "Espressif 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": "-DNO_TLS_SUPPORT",
+      "extra_flags": "-DTASMOTA_SDK",
       "f_cpu": "240000000L",
       "f_flash": "40000000L",
       "flash_mode": "dio",

boards/seeed_xiao_esp32c6.json

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

cspell.json

@@ -38,6 +38,7 @@
     "vite.config.ts",
     "lib/esp32-psram/**",
     "test/test_api/test_api.h",
-    "lib_standalone/**"
+    "lib_standalone/**",
+    "**/*.js"
   ]
   }

docs/dump_telegrams.csv

@@ -171,6 +171,7 @@ telegram_type_id,name,is_fetched
 0x0468,HPSet, 
 0x0469,HPSet, 
 0x046A,HPSet, 
+0x0470,RC300Summer2, 
 0x0471,RC300Summer2, 
 0x0472,RC300Summer2, 
 0x0473,RC300Summer2, 
@@ -178,7 +179,6 @@ telegram_type_id,name,is_fetched
 0x0475,RC300Summer2, 
 0x0476,RC300Summer2, 
 0x0477,RC300Summer2, 
-0x0478,RC300Summer2, 
 0x047B,HP2, 
 0x0484,HPSilentMode,fetched
 0x0485,HpCooling,fetched

interface/package.json

@@ -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\""
@@ -30,7 +30,7 @@
     "@mui/material": "^9.0.0",
     "@preact/compat": "^18.3.2",
     "@table-library/react-table-library": "4.1.15",
-    "alova": "^3.5.1",
+    "alova": "3.5.1",
     "async-validator": "^4.2.5",
     "etag": "^1.8.1",
     "formidable": "^3.5.4",
@@ -41,8 +41,8 @@
     "react": "^19.2.5",
     "react-dom": "^19.2.5",
     "react-icons": "^5.6.0",
-    "react-router": "^7.14.1",
-    "react-toastify": "^11.0.5",
+    "react-router": "^7.14.2",
+    "react-toastify": "^11.1.0",
     "typesafe-i18n": "^5.27.1",
     "typescript": "^6.0.3"
   },
@@ -57,14 +57,15 @@
     "@types/react-dom": "^19.2.3",
     "axe-core": "^4.11.3",
     "concurrently": "^9.2.1",
-    "eslint": "^10.2.0",
+    "eslint": "^10.2.1",
     "eslint-config-prettier": "^10.1.8",
     "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"
+    "typescript-eslint": "^8.59.0",
+    "vite": "^8.0.9",
+    "vite-plugin-imagemin": "^0.6.1",
+    "vite-tsconfig-paths": "^6.1.1"
   },
-  "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
+  "packageManager": "pnpm@10.33.1+sha512.05ba3c1d5d1c18f68df06470d74055e62d41fc110a0c660db1b2dfb2785327f04cf0f68345d4609bc52089e7fa0343c31593b2f9594e2c5d5da426230acc9820"
 }

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,34 +39,32 @@ const AppRouting: FC = memo(() => {
 
   return (
     <Authentication>
-      <Suspense fallback={<LoadingSpinner />}>
-        <Routes>
-          <Route
-            path="/unauthorized"
-            element={<RootRedirect message={LL.PLEASE_SIGNIN()} signOut />}
-          />
-          <Route
-            path="/fileUpdated"
-            element={<RootRedirect message={LL.UPLOAD_SUCCESSFUL()} />}
-          />
-          <Route
-            path="/"
-            element={
-              <RequireUnauthenticated>
-                <SignIn />
-              </RequireUnauthenticated>
-            }
-          />
-          <Route
-            path="/*"
-            element={
-              <RequireAuthenticated>
-                <AuthenticatedRouting />
-              </RequireAuthenticated>
-            }
-          />
-        </Routes>
-      </Suspense>
+      <Routes>
+        <Route
+          path="/unauthorized"
+          element={<RootRedirect message={LL.PLEASE_SIGNIN()} signOut />}
+        />
+        <Route
+          path="/fileUpdated"
+          element={<RootRedirect message={LL.UPLOAD_SUCCESSFUL()} />}
+        />
+        <Route
+          path="/"
+          element={
+            <RequireUnauthenticated>
+              <SignIn />
+            </RequireUnauthenticated>
+          }
+        />
+        <Route
+          path="/*"
+          element={
+            <RequireAuthenticated>
+              <AuthenticatedRouting />
+            </RequireAuthenticated>
+          }
+        />
+      </Routes>
     </Authentication>
   );
 });

interface/src/AuthenticatedRouting.tsx

@@ -1,86 +1,77 @@
-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 />} />
-          <Route path="/sensors/*" element={<Sensors />} />
-          <Route path="/help/*" element={<Help />} />
-          <Route path="/user/*" element={<UserProfile />} />
+      <Routes>
+        <Route path="/dashboard/*" element={<Dashboard />} />
+        <Route path="/devices/*" element={<Devices />} />
+        <Route path="/sensors/*" element={<Sensors />} />
+        <Route path="/help/*" element={<Help />} />
+        <Route path="/user/*" element={<UserProfile />} />
 
-          <Route path="/status/*" element={<Status />} />
-          <Route path="/status/hardwarestatus/*" element={<HardwareStatus />} />
-          <Route path="/status/activity" element={<Activity />} />
-          <Route path="/status/log" element={<SystemLog />} />
-          <Route path="/status/mqtt" element={<MqttStatus />} />
-          <Route path="/status/ntp" element={<NTPStatus />} />
-          <Route path="/status/ap" element={<APStatus />} />
-          <Route path="/status/network" element={<NetworkStatus />} />
-          <Route path="/status/version" element={<Version />} />
+        <Route path="/status/*" element={<Status />} />
+        <Route path="/status/hardwarestatus/*" element={<HardwareStatus />} />
+        <Route path="/status/activity" element={<Activity />} />
+        <Route path="/status/log" element={<SystemLog />} />
+        <Route path="/status/mqtt" element={<MqttStatus />} />
+        <Route path="/status/ntp" element={<NTPStatus />} />
+        <Route path="/status/ap" element={<APStatus />} />
+        <Route path="/status/network" element={<NetworkStatus />} />
+        <Route path="/status/version" element={<Version />} />
 
-          {me.admin && (
-            <>
-              <Route path="/settings" element={<Settings />} />
-              <Route
-                path="/settings/application"
-                element={<ApplicationSettings />}
-              />
-              <Route path="/settings/mqtt" element={<MqttSettings />} />
-              <Route path="/settings/ntp" element={<NTPSettings />} />
-              <Route path="/settings/ap" element={<APSettings />} />
-              <Route path="/settings/modules" element={<Modules />} />
-              <Route path="/settings/downloadUpload" element={<DownloadUpload />} />
+        {me.admin && (
+          <>
+            <Route path="/settings" element={<Settings />} />
+            <Route path="/settings/application" element={<ApplicationSettings />} />
+            <Route path="/settings/mqtt" element={<MqttSettings />} />
+            <Route path="/settings/ntp" element={<NTPSettings />} />
+            <Route path="/settings/ap" element={<APSettings />} />
+            <Route path="/settings/modules" element={<Modules />} />
+            <Route path="/settings/downloadUpload" element={<DownloadUpload />} />
 
-              <Route path="/settings/network/*" element={<Network />} />
-              <Route path="/settings/security/*" element={<Security />} />
+            <Route path="/settings/network/*" element={<Network />} />
+            <Route path="/settings/security/*" element={<Security />} />
 
-              <Route path="/customizations" element={<Customizations />} />
-              <Route path="/scheduler" element={<Scheduler />} />
-              <Route path="/customentities" element={<CustomEntities />} />
-            </>
-          )}
+            <Route path="/customizations" element={<Customizations />} />
+            <Route path="/scheduler" element={<Scheduler />} />
+            <Route path="/customentities" element={<CustomEntities />} />
+          </>
+        )}
 
-          <Route path="/*" element={<Navigate to="/" />} />
-        </Routes>
-      </Suspense>
+        <Route path="/*" element={<Navigate to="/" />} />
+      </Routes>
     </Layout>
   );
 });

interface/src/SignIn.tsx

@@ -18,7 +18,7 @@ import { PROJECT_NAME } from 'env';
 import { useI18nContext } from 'i18n/i18n-react';
 import type { SignInRequest } from 'types';
 import { onEnterCallback, updateValue } from 'utils';
-import { SIGN_IN_REQUEST_VALIDATOR, validate } from 'validators';
+import { SIGN_IN_REQUEST_VALIDATOR, ValidationError, validate } from 'validators';
 
 const SignIn = memo(() => {
   const authenticationContext = useContext(AuthenticationContext);
@@ -74,7 +74,7 @@ const SignIn = memo(() => {
       await validate(SIGN_IN_REQUEST_VALIDATOR, signInRequest);
       await signIn();
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
       setProcessing(false);
     }
   }, [signInRequest, signIn, LL]);

interface/src/app/main/CustomEntitiesDialog.tsx

@@ -28,7 +28,7 @@ import type { ValidateFieldsError } from 'async-validator';
 import { BlockFormControlLabel, ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValue } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 
 import { DeviceValueType, DeviceValueTypeNames, DeviceValueUOM_s } from './types';
 import type { EntityItem } from './types';
@@ -136,7 +136,7 @@ const CustomEntitiesDialog = ({
       }
       onSave(processedItem);
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [validator, editItem, onSave]);
 
@@ -215,7 +215,7 @@ const CustomEntitiesDialog = ({
                   name="value"
                   label={LL.DEFAULT(0) + ' ' + LL.VALUE(0)}
                   type="string"
-                  value={editItem.value as string}
+                  value={editItem.value}
                   variant="outlined"
                   onChange={updateFormValue}
                   fullWidth
@@ -260,7 +260,7 @@ const CustomEntitiesDialog = ({
                   margin="normal"
                   sx={{ width: '11ch' }}
                   type="string"
-                  value={editItem.device_id as string}
+                  value={editItem.device_id}
                   onChange={updateFormValue}
                   slotProps={{
                     input: {
@@ -280,7 +280,7 @@ const CustomEntitiesDialog = ({
                   margin="normal"
                   sx={{ width: '11ch' }}
                   type="string"
-                  value={editItem.type_id as string}
+                  value={editItem.type_id}
                   onChange={updateFormValue}
                   slotProps={{
                     input: {
@@ -381,7 +381,7 @@ const CustomEntitiesDialog = ({
                     fieldErrors={fieldErrors || {}}
                     name="factor"
                     label={LL.BITMASK()}
-                    value={editItem.factor as string}
+                    value={editItem.factor}
                     sx={{ width: '11ch' }}
                     variant="outlined"
                     onChange={updateFormValue}

interface/src/app/main/DevicesDialog.tsx

@@ -24,7 +24,7 @@ import type { ValidateFieldsError } from 'async-validator';
 import { ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValue } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 
 import { DeviceValueUOM, DeviceValueUOM_s } from './types';
 import type { DeviceValue } from './types';
@@ -67,7 +67,7 @@ const DevicesDialog = ({
       await validate(validator, editItem);
       onSave(editItem);
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [validator, editItem, onSave]);
 

interface/src/app/main/SchedulerDialog.tsx

@@ -26,7 +26,7 @@ import type { ValidateFieldsError } from 'async-validator';
 import { BlockFormControlLabel, ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { updateValue } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 
 import { ScheduleFlag } from './types';
 import type { ScheduleItem } from './types';
@@ -120,7 +120,7 @@ const SchedulerDialog = ({
         await validate(validator, itemToSave);
         onSave(itemToSave);
       } catch (error) {
-        setFieldErrors(error as ValidateFieldsError);
+        setFieldErrors((error as ValidationError).fieldErrors);
       }
     },
     [validator, onSave]

interface/src/app/main/SensorsAnalogDialog.tsx

@@ -23,7 +23,7 @@ import type { ValidateFieldsError } from 'async-validator';
 import { ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValue } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 
 import { AnalogType, AnalogTypeNames, DeviceValueUOM_s } from './types';
 import type { AnalogSensor } from './types';
@@ -172,7 +172,7 @@ const SensorsAnalogDialog = ({
       await validate(validator, editItem);
       onSave(editItem);
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [validator, editItem, onSave]);
 

interface/src/app/main/SensorsTemperatureDialog.tsx

@@ -21,7 +21,7 @@ import type { ValidateFieldsError } from 'async-validator';
 import { ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValue } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 
 import type { TemperatureSensor } from './types';
 
@@ -84,7 +84,7 @@ const SensorsTemperatureDialog = ({
       await validate(validator, editItem);
       onSave(editItem);
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [validator, editItem, onSave]);
 

interface/src/app/main/types.ts

@@ -43,16 +43,6 @@ 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/APSettings.tsx

@@ -21,7 +21,7 @@ import { useI18nContext } from 'i18n/i18n-react';
 import type { APSettingsType } from 'types';
 import { APProvisionMode } from 'types';
 import { numberValue, updateValueDirty, useRest } from 'utils';
-import { createAPSettingsValidator, validate } from 'validators';
+import { ValidationError, createAPSettingsValidator, validate } from 'validators';
 
 export const isAPEnabled = ({ provision_mode }: APSettingsType) =>
   provision_mode === APProvisionMode.AP_MODE_ALWAYS ||
@@ -86,7 +86,7 @@ const APSettings = () => {
       await validate(createAPSettingsValidator(data), data);
       await saveData();
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [data, saveData]);
 

interface/src/app/settings/ApplicationSettings.tsx

@@ -28,13 +28,12 @@ import {
   FormLoader,
   MessageBox,
   SectionContent,
-  ValidatedPasswordField,
   ValidatedTextField,
   useLayoutTitle
 } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValueDirty, useRest } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 
 import { API, getBoardProfile, readSettings, writeSettings } from '../../api/app';
 import { BOARD_PROFILES } from '../main/types';
@@ -154,7 +153,7 @@ const ApplicationSettings = () => {
       setFieldErrors(undefined);
       await validate(createSettingsValidator(data), data);
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     } finally {
       await saveData();
     }
@@ -352,156 +351,6 @@ 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>

interface/src/app/settings/DownloadUpload.tsx

@@ -112,6 +112,7 @@ const DownloadUpload = () => {
   const handleDownload = useCallback(
     (type: string) => () => {
       void sendExportData(type);
+      setConfirmBackup(false);
     },
     [sendExportData]
   );

interface/src/app/settings/MqttSettings.tsx

@@ -31,7 +31,7 @@ import {
 import { useI18nContext } from 'i18n/i18n-react';
 import type { MqttSettingsType } from 'types';
 import { numberValue, updateValueDirty, useRest } from 'utils';
-import { createMqttSettingsValidator, validate } from 'validators';
+import { ValidationError, createMqttSettingsValidator, validate } from 'validators';
 
 import { callAction } from '../../api/app';
 
@@ -94,7 +94,7 @@ const MqttSettings = () => {
       await validate(createMqttSettingsValidator(data), data);
       await saveData();
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [data, saveData]);
 

interface/src/app/settings/NTPSettings.tsx

@@ -36,7 +36,7 @@ import {
 import { useI18nContext } from 'i18n/i18n-react';
 import type { NTPSettingsType, Time } from 'types';
 import { formatLocalDateTime, updateValueDirty, useRest } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 import { NTP_SETTINGS_VALIDATOR } from 'validators/ntp';
 
 import { TIME_ZONES, selectedTimeZone, useTimeZoneSelectItems } from './TZ';
@@ -133,7 +133,7 @@ const NTPSettings = () => {
       await validate(NTP_SETTINGS_VALIDATOR, data);
       await saveData();
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [data, saveData]);
 

interface/src/app/settings/network/NetworkSettings.tsx

@@ -40,7 +40,7 @@ import {
 import { useI18nContext } from 'i18n/i18n-react';
 import type { NetworkSettingsType } from 'types';
 import { updateValueDirty, useRest } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 import { createNetworkSettingsValidator } from 'validators/network';
 
 import SystemMonitor from '../../status/SystemMonitor';
@@ -116,7 +116,7 @@ const NetworkSettings = () => {
       await validate(createNetworkSettingsValidator(data), data);
       await saveData();
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
     deselectNetwork();
   }, [data, saveData, deselectNetwork]);

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

@@ -19,7 +19,7 @@ import { AuthenticatedContext } from 'contexts/authentication';
 import { useI18nContext } from 'i18n/i18n-react';
 import type { SecuritySettingsType } from 'types';
 import { updateValueDirty, useRest } from 'utils';
-import { SECURITY_SETTINGS_VALIDATOR, validate } from 'validators';
+import { SECURITY_SETTINGS_VALIDATOR, ValidationError, validate } from 'validators';
 
 const SecuritySettings = () => {
   const { LL } = useI18nContext();
@@ -58,7 +58,7 @@ const SecuritySettings = () => {
       await saveData();
       await authenticatedContext.refresh();
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [data, saveData, authenticatedContext]);
 

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

@@ -24,7 +24,7 @@ import {
 import { useI18nContext } from 'i18n/i18n-react';
 import type { UserType } from 'types';
 import { updateValue } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 
 interface UserFormProps {
   creating: boolean;
@@ -69,7 +69,7 @@ const User: FC<UserFormProps> = ({
         await validate(validator, user);
         onDoneEditing();
       } catch (error) {
-        setFieldErrors(error as ValidateFieldsError);
+        setFieldErrors((error as ValidationError).fieldErrors);
       }
     }
   }, [user, validator, onDoneEditing]);

interface/src/app/status/Version.tsx

@@ -315,13 +315,22 @@ const InstallDialog = memo(
               fetchDevVersion ? latestDevVersion?.name : latestVersion?.name
             )}
           </Typography>
-
-          {upgradeImportantMessageType === 1 && LL.UPGRADE_IMPORTANT_MESSAGES_1()}
           {upgradeImportantMessageType === 2 && LL.UPGRADE_IMPORTANT_MESSAGES_2()}
+          {upgradeImportantMessageType === 1 && (
+            <>
+              {LL.UPGRADE_IMPORTANT_MESSAGES_1()}
+              <Typography sx={{ mt: 2 }}>
+                <Link to="/settings/downloadUpload" style={{ color: 'lightblue' }}>
+                  {LL.DOWNLOAD_SYSTEM_BACKUP()}
+                </Link>
+              </Typography>
+            </>
+          )}
           <Typography sx={{ mt: 2 }}>
             <Link
-              target="_blank"
               to="https://docs.emsesp.org/FAQ#upgrading-the-firmware"
+              target="_blank"
+              rel="noreferrer"
               style={{ color: 'lightblue' }}
             >
               {LL.ONLINE_HELP()}

interface/src/components/upload/DragNdrop.tsx

@@ -211,14 +211,15 @@ const DragNdrop = ({ text, onFileSelected }: DragNdropProps) => {
                 {LL.UPGRADE_IMPORTANT_MESSAGES()}
               </DialogTitle>
               <DialogContent dividers>
-                {upgradeImportantMessageType === 1 &&
-                  LL.UPGRADE_IMPORTANT_MESSAGES_1()}
                 {upgradeImportantMessageType === 2 &&
                   LL.UPGRADE_IMPORTANT_MESSAGES_2()}
+                {upgradeImportantMessageType === 1 &&
+                  LL.UPGRADE_IMPORTANT_MESSAGES_1()}
                 <Typography sx={{ mt: 2 }}>
                   <Link
-                    target="_blank"
                     to="https://docs.emsesp.org/FAQ#upgrading-the-firmware"
+                    target="_blank"
+                    rel="noreferrer"
                     style={{ color: 'lightblue' }}
                   >
                     {LL.ONLINE_HELP()}

interface/src/i18n/cz/index.ts

@@ -350,19 +350,19 @@ 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',
+  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é údaje',
+  NO_DATA: 'žádné údaje',
   USER_PROFILE: 'Uživatelský profil',
   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 jste vytvořili zálohu své konfigurace a nastavení před pokračováním a nahrajte ji po instalaci nové verze.',
+  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?'
 

interface/src/i18n/de/index.ts

@@ -187,7 +187,7 @@ const de: Translation = {
   COMPACT: 'Kompakte Darstellung',
   DOWNLOAD_SETTINGS_TEXT: 'Erstellen Sie eine Sicherung Ihrer Konfigurationen und Einstellungen',
   DOWNLOAD_SETTINGS_TEXT2: 'Exportiere alle Werte',
-  DOWNLOAD_SYSTEM_BACKUP: 'System Sicherung',
+  DOWNLOAD_SYSTEM_BACKUP: 'Systemsicherung',
   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.',
@@ -350,7 +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',
+  NO_GPIO: 'Keine freien GPIO gefunden',
   THIS_VERSION: 'Diese Version',
   PLATFORM: 'Plattform',
   RELEASE_TYPE: 'Release Typ',
@@ -362,9 +362,9 @@ const de: Translation = {
   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 eine Sicherung Ihrer Konfiguration und Einstellungen vor dem Fortfahren erstellt haben und diese nach der Installation der neuen Version hochladen.',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Für diese Aktualisierung ist ein Werksreset erforderlich. 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?'
+  WARNING_SYSTEM_BACKUP: 'Dies wird eine Sicherung Ihrer vollständigen Systemkonfiguration und Einstellungen erstellen. Alle Passwörter werden in dieser Sicherungsdatei lesbar sein. Seien Sie vorsichtig beim Teilen! Möchten Sie fortfahren?'
 
 };
 

interface/src/i18n/en/index.ts

@@ -350,7 +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',
+  NO_GPIO: 'No available GPIO found',
   THIS_VERSION: 'This Version',
   PLATFORM: 'Platform',
   RELEASE_TYPE: 'Release Type',
@@ -362,7 +362,7 @@ const en: Translation = {
   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 have made a backup of your configuration and settings before continuing, and upload this after the new version is installed.',
+  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?'
 

interface/src/i18n/fr/index.ts

@@ -350,7 +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é",
+  NO_GPIO: "Aucun GPIO disponible n'a été détecté",
   THIS_VERSION: 'Cette version',
   PLATFORM: 'Plateforme',
   RELEASE_TYPE: 'Type de version',
@@ -362,7 +362,7 @@ const fr: Translation = {
   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 d\'avoir créé une sauvegarde de vos configurations et paramètres avant de continuer et de la charger après l\'installation de la nouvelle version.',
+  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 ?'
 

interface/src/i18n/it/index.ts

@@ -350,7 +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',
+  NO_GPIO: 'Non è stato trovato alcun GPIO disponibile',
   THIS_VERSION: 'Questa versione',
   PLATFORM: 'Piattaforma',
   RELEASE_TYPE: 'Tipo di rilascio',
@@ -362,7 +362,7 @@ const it: Translation = {
   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 aver creato un backup delle tue configurazioni e impostazioni prima di continuare e di caricarlo dopo l\'installazione della nuova versione.',
+  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?'
 

interface/src/i18n/nl/index.ts

@@ -350,7 +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',
+  NO_GPIO: 'Er is geen beschikbare GPIO gevonden',
   THIS_VERSION: 'Deze Versie',
   PLATFORM: 'Platform',
   RELEASE_TYPE: 'Release Typ',
@@ -362,7 +362,7 @@ const nl: Translation = {
   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 een back-up van uw configuratie en instellingen hebt gemaakt voordat u doorgaat en upload deze na de installatie van de nieuwe versie.',
+  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?'
 

interface/src/i18n/no/index.ts

@@ -350,7 +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',
+  NO_GPIO: 'Det ble ikke funnet noen tilgjengelige GPIO-porter',
   THIS_VERSION: 'Denne versjonen',
   PLATFORM: 'Plattform',
   RELEASE_TYPE: 'Utgivelses type',
@@ -362,7 +362,7 @@ const no: Translation = {
   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 har laget en sikkerhetskopi av din konfigurasjon og innstillinger før du fortsetter, og last denne opp etter at den nye versjonen er installert.',
+  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?'
 

interface/src/i18n/pl/index.ts

@@ -350,7 +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',
+  NO_GPIO: 'Nie znaleziono dostępnych pinów GPIO',
   THIS_VERSION: 'Ta wersja',
   PLATFORM: 'Platforma',
   RELEASE_TYPE: 'Typ wydania',
@@ -362,7 +362,7 @@ const pl: BaseTranslation = {
   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 masz utworzoną kopię swoich ustawień i konfiguracji przed kontynuowaniem i przesuń ją po zainstalowaniu nowej wersji.',
+  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ć?'
 

interface/src/i18n/sk/index.ts

@@ -350,7 +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',
+  NO_GPIO: 'Nebol nájdený žiadny dostupný GPIO',
   THIS_VERSION: 'Táto verzia',
   PLATFORM: 'Platforma',
   RELEASE_TYPE: 'Typ vydania',
@@ -362,7 +362,7 @@ const sk: Translation = {
   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 ste vytvorili zálohu svojich konfigurácií a nastavení pred pokračovaním a nahrajte ju po instalácii novej verzie.',
+  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ť?'
 

interface/src/i18n/sv/index.ts

@@ -350,7 +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',
+  NO_GPIO: 'Inga tillgängliga GPIO-portar hittades',
   THIS_VERSION: 'Denna version',
   PLATFORM: 'Plattform',
   RELEASE_TYPE: 'Utgivelsestyp',
@@ -362,7 +362,7 @@ const sv: Translation = {
   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 har gjort en säkerhetskopia av din konfiguration och inställningar innan du fortsätter och ladda upp denna efter att den nya versionen är installerad.',
+  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?'
 

interface/src/i18n/tr/index.ts

@@ -350,7 +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ı',
+  NO_GPIO: 'Kullanılabilir GPIO bulunamadı',
   THIS_VERSION: 'Bu Sürüm',
   PLATFORM: 'Platforma',
   RELEASE_TYPE: 'Sürüm Tipi',

interface/src/validators/shared.ts

@@ -1,6 +1,20 @@
-import type { InternalRuleItem, ValidateOption } from 'async-validator';
+import type {
+  InternalRuleItem,
+  ValidateFieldsError,
+  ValidateOption
+} from 'async-validator';
 import type Schema from 'async-validator';
 
+export class ValidationError extends Error {
+  readonly fieldErrors: ValidateFieldsError;
+
+  constructor(fieldErrors: ValidateFieldsError) {
+    super('Validation failed');
+    this.name = 'ValidationError';
+    this.fieldErrors = fieldErrors;
+  }
+}
+
 export const validate = <T extends object>(
   validator: Schema,
   source: Partial<T>,
@@ -8,7 +22,7 @@ export const validate = <T extends object>(
 ): Promise<T> =>
   new Promise((resolve, reject) => {
     void validator.validate(source, options ?? {}, (errors, fieldErrors) => {
-      errors ? reject(fieldErrors as Error) : resolve(source as T);
+      errors ? reject(new ValidationError(fieldErrors)) : resolve(source as T);
     });
   });
 

interface/vite.config.ts

@@ -15,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
@@ -130,40 +130,9 @@ 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';
-    }
-    return undefined;
-  };
+const manualChunks = (id: string): string | undefined => {
+  if (id.includes('node_modules')) return 'vendor';
+  return undefined;
 };
 
 // Common build base configuration
@@ -290,7 +259,7 @@ export default defineConfig(
               moduleSideEffects: false
             },
             output: {
-              manualChunks: createManualChunks(false)
+              manualChunks
             }
           }
         }
@@ -330,7 +299,7 @@ export default defineConfig(
             chunkFileNames: 'assets/[name]-[hash].js',
             entryFileNames: 'assets/[name]-[hash].js',
             assetFileNames: 'assets/[name]-[hash].[ext]',
-            manualChunks: createManualChunks(true),
+            manualChunks,
             sourcemap: false
           }
         }

lib/espMqttClient/src/Config.h

@@ -49,10 +49,6 @@ 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
@@ -70,10 +66,14 @@ the LICENSE file.
 #endif
 
 #if EMC_USE_MEMPOOL
-#ifndef EMC_NUM_POOL_ELEMENTS
-#define EMC_NUM_POOL_ELEMENTS 32
-#endif
-#ifndef EMC_SIZE_POOL_ELEMENTS
-#define EMC_SIZE_POOL_ELEMENTS 128
+  #ifndef EMC_NUM_POOL_ELEMENTS
+    #define EMC_NUM_POOL_ELEMENTS 32
+  #endif
+  #ifndef EMC_SIZE_POOL_ELEMENTS
+    #define EMC_SIZE_POOL_ELEMENTS 128
+  #endif
 #endif
+
+#ifndef  TASMOTA_SDK
+#define EMC_CLIENT_SECURE
 #endif

lib/espMqttClient/src/MqttClient.cpp

@@ -62,11 +62,7 @@ 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);
-    }
+    xTaskCreatePinnedToCore((TaskFunction_t)_loop, "mqttclient", EMC_TASK_STACK_SIZE, this, priority, &_taskHandle, core);
   }
 #else
   (void) useInternalTask;
@@ -74,7 +70,6 @@ MqttClient::MqttClient(espMqttClientTypes::UseInternalTask useInternalTask, uint
   (void) core;
 #endif
   _clientId = _generatedClientId;
-  _core = core;
 }
 
 MqttClient::~MqttClient() {

lib/espMqttClient/src/MqttClient.h

@@ -69,17 +69,7 @@ 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);
   espMqttClientTypes::UseInternalTask _useInternalTask;
@@ -108,7 +98,6 @@ 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__) || defined(__APPLE__)
+#if defined(__linux__)
 
 namespace espMqttClientInternals {
 

lib/espMqttClient/src/Transport/ClientPosix.h

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

lib/espMqttClient/src/Transport/ClientSecureSync.cpp

@@ -6,65 +6,66 @@ For a copy, see <https://opensource.org/licenses/MIT> or
 the LICENSE file.
 */
 
-#ifndef NO_TLS_SUPPORT
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
 
 #include "ClientSecureSync.h"
-#include <lwip/sockets.h>
-#include "../Config.h"
+#include <lwip/sockets.h>  // socket options
 
 namespace espMqttClientInternals {
 
 ClientSecureSync::ClientSecureSync()
-    : client() {
-    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();
+: client() {
+  // empty
 }
 
 bool ClientSecureSync::connect(IPAddress ip, uint16_t port) {
-    bool ret = client.connect(ip, port); // implicit conversion of return code int --> bool
-    if (ret) {
-        // Set TCP option directly to bypass lack of working setNoDelay for WiFiClientSecure
-        int val = true;
-        basic_client.setSocketOption(IPPROTO_TCP, TCP_NODELAY, &val, sizeof(int));
-    }
-    return ret;
+  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
+  }
+  return ret;
 }
 
-bool ClientSecureSync::connect(const char * host, uint16_t port) {
-    bool ret = client.connect(host, port); // implicit conversion of return code int --> bool
-    if (ret) {
-        // Set TCP option directly to bypass lack of working setNoDelay for WiFiClientSecure
-        int val = true;
-        basic_client.setSocketOption(IPPROTO_TCP, TCP_NODELAY, &val, sizeof(int));
-    }
-    return ret;
+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
+  }
+  return ret;
 }
 
-size_t ClientSecureSync::write(const uint8_t * buf, size_t size) {
-    return client.write(buf, size);
+size_t ClientSecureSync::write(const uint8_t* buf, size_t size) {
+  return client.write(buf, size);
 }
 
-int ClientSecureSync::read(uint8_t * buf, size_t size) {
-    return client.read(buf, size);
+int ClientSecureSync::read(uint8_t* buf, size_t size) {
+  return client.read(buf, size);
 }
 
 void ClientSecureSync::stop() {
-    client.stop();
+  client.stop();
 }
 
 bool ClientSecureSync::connected() {
-    return client.connected();
+  return client.connected();
 }
 
 bool ClientSecureSync::disconnected() {
-    return !client.connected();
+  return !client.connected();
 }
 
-} // namespace espMqttClientInternals
+}  // namespace espMqttClientInternals
 
-#endif
+#endif

lib/espMqttClient/src/Transport/ClientSecureSync.h

@@ -8,11 +8,15 @@ the LICENSE file.
 
 #pragma once
 
-#ifndef NO_TLS_SUPPORT
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
 
-// #include "esp_tls.h"
+// Added for EMS-ESP
+#include "../Config.h"
+#if defined(EMC_CLIENT_SECURE)
+#include <WiFiClientSecure.h> // includes IPAddress
+#else
 #include <WiFiClient.h>
-#include <ESP_SSLClient.h>
+#endif
 #include "Transport.h"
 
 namespace espMqttClientInternals {
@@ -20,7 +24,6 @@ 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;
@@ -28,11 +31,14 @@ class ClientSecureSync : public Transport {
     void   stop() override;
     bool   connected() override;
     bool   disconnected() override;
-
-    WiFiClient    basic_client;
-    ESP_SSLClient client;
+    // added for EMS-ESP
+#if defined(EMC_CLIENT_SECURE)
+    WiFiClientSecure client;
+#else
+    WiFiClient client;
+#endif
 };
 
 } // namespace espMqttClientInternals
 
-#endif
+#endif

lib/espMqttClient/src/espMqttClient.cpp

@@ -8,6 +8,50 @@ 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)
@@ -34,45 +78,51 @@ espMqttClientSecure::espMqttClientSecure(uint8_t priority, uint8_t core)
 }
 
 espMqttClientSecure & espMqttClientSecure::setInsecure() {
-#ifndef NO_TLS_SUPPORT
+#if defined(EMC_CLIENT_SECURE)
     _client.client.setInsecure();
 #endif
     return *this;
 }
 
 espMqttClientSecure & espMqttClientSecure::setCACert(const char * rootCA) {
-#ifndef NO_TLS_SUPPORT
+#if defined(EMC_CLIENT_SECURE)
     _client.client.setCACert(rootCA);
 #endif
     return *this;
 }
 
 espMqttClientSecure & espMqttClientSecure::setCertificate(const char * clientCa) {
-#ifndef NO_TLS_SUPPORT
+#if defined(EMC_CLIENT_SECURE)
     _client.client.setCertificate(clientCa);
 #endif
     return *this;
 }
 
 espMqttClientSecure & espMqttClientSecure::setPrivateKey(const char * privateKey) {
-#ifndef NO_TLS_SUPPORT
+#if defined(EMC_CLIENT_SECURE)
     _client.client.setPrivateKey(privateKey);
 #endif
     return *this;
 }
 
 espMqttClientSecure & espMqttClientSecure::setPreSharedKey(const char * pskIdent, const char * psKey) {
-#ifndef NO_TLS_SUPPORT
+#if defined(EMC_CLIENT_SECURE)
+    _client.client.setPreSharedKey(pskIdent, psKey);
 #endif
     return *this;
 }
 
 #endif
 
-#if defined(__linux__) || defined(__APPLE__)
+#if defined(__linux__)
 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__) || defined(__APPLE__)
+#elif defined(__linux__)
 #include "Transport/ClientPosix.h"
 #endif
 
@@ -65,16 +65,10 @@ 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
 };
 
-#endif
-
-#if defined(__linux__) || defined(__APPLE__)
+#elif defined(__linux__)
 class espMqttClient : public MqttClientSetup<espMqttClient> {
   public:
     espMqttClient();
@@ -82,4 +76,10 @@ 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"

lib/semver/version.inl

@@ -1,132 +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 {
-
-namespace {
-
-/// Utility function to splice all vector elements to output stream, using designated separator
-/// between elements and function object for getting values from vector elements.
-template <typename T, typename F>
-std::string & splice(std::string & ss, const std::vector<T> & vec, const std::string & sep, F read) {
-    if (!vec.empty()) {
-        for (auto it = vec.cbegin(); it < vec.cend() - 1; ++it) {
-            ss += read(*it) + sep;
-        }
-        ss += read(*vec.crbegin());
-    }
-    return ss;
-}
-
-} // namespace
-
-template <typename Parser, typename Comparator>
-Basic_version<Parser, Comparator>::Basic_version(Parser p, Comparator c)
-    : parser_(p)
-    , comparator_(c)
-    , ver_(parser_.parse("0.0.0")) {
-}
-
-template <typename Parser, typename Comparator>
-Basic_version<Parser, Comparator>::Basic_version(const std::string & v, Parser p, Comparator c)
-    : parser_(p)
-    , comparator_(c)
-    , ver_(parser_.parse(v)) {
-}
-
-template <typename Parser, typename Comparator>
-Basic_version<Parser, Comparator>::Basic_version(const Version_data & v, Parser p, Comparator c)
-    : parser_(p)
-    , comparator_(c)
-    , ver_(v) {
-}
-
-template <typename Parser, typename Comparator>
-Basic_version<Parser, Comparator>::Basic_version(const Basic_version<Parser, Comparator> &) = default;
-
-template <typename Parser, typename Comparator>
-Basic_version<Parser, Comparator> & Basic_version<Parser, Comparator>::operator=(const Basic_version<Parser, Comparator> &) = default;
-
-template <typename Parser, typename Comparator>
-int Basic_version<Parser, Comparator>::major() const {
-    return ver_.major;
-}
-
-template <typename Parser, typename Comparator>
-int Basic_version<Parser, Comparator>::minor() const {
-    return ver_.minor;
-}
-
-template <typename Parser, typename Comparator>
-int Basic_version<Parser, Comparator>::patch() const {
-    return ver_.patch;
-}
-
-template <typename Parser, typename Comparator>
-const std::string Basic_version<Parser, Comparator>::prerelease() const {
-    std::string ss;
-    return splice(ss, ver_.prerelease_ids, ".", [](const Prerelease_identifier & id) { return id.first; });
-}
-
-template <typename Parser, typename Comparator>
-const std::string Basic_version<Parser, Comparator>::build() const {
-    std::string ss;
-    return splice(ss, ver_.build_ids, ".", [](const std::string & id) { return id; });
-}
-
-template <typename Parser, typename Comparator>
-bool operator<(const Basic_version<Parser, Comparator> & l, const Basic_version<Parser, Comparator> & r) {
-    return l.comparator_.compare(l.ver_, r.ver_) == -1;
-}
-
-template <typename Parser, typename Comparator>
-bool operator==(const Basic_version<Parser, Comparator> & l, const Basic_version<Parser, Comparator> & r) {
-    return l.comparator_.compare(l.ver_, r.ver_) == 0;
-}
-
-template <typename Parser, typename Comparator>
-inline bool operator!=(const Basic_version<Parser, Comparator> & l, const Basic_version<Parser, Comparator> & r) {
-    return !(l == r);
-}
-
-template <typename Parser, typename Comparator>
-inline bool operator>(const Basic_version<Parser, Comparator> & l, const Basic_version<Parser, Comparator> & r) {
-    return r < l;
-}
-
-template <typename Parser, typename Comparator>
-inline bool operator>=(const Basic_version<Parser, Comparator> & l, const Basic_version<Parser, Comparator> & r) {
-    return !(l < r);
-}
-
-template <typename Parser, typename Comparator>
-inline bool operator<=(const Basic_version<Parser, Comparator> & l, const Basic_version<Parser, Comparator> & r) {
-    return !(l > r);
-}
-
-} // namespace version

mock-api/package.json

@@ -15,5 +15,5 @@
     "itty-router": "^5.0.23",
     "prettier": "^3.8.3"
   },
-  "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
+  "packageManager": "pnpm@10.33.1+sha512.05ba3c1d5d1c18f68df06470d74055e62d41fc110a0c660db1b2dfb2785327f04cf0f68345d4609bc52089e7fa0343c31593b2f9594e2c5d5da426230acc9820"
 }

pio_local.ini_example

@@ -20,7 +20,7 @@ my_build_flags =
 
 [platformio]
 default_envs = s_16M_P ; BBQKees E32V2
-; default_envs = build_webUI ; build the web interface only
+; default_envs = build-webUI ; build the web interface only
 ; default_envs = s3_16M_P ; BBQKees S3
 ; default_envs = s_4M ; BBQKees older S32, 4MB no psram
 ; default_envs = s_16M ; BBQKees newer S32 V2, 16MB no psram

platformio.ini

@@ -21,8 +21,8 @@ extra_configs =
   pio_local.ini
 
 [common]
-core_build_flags = -std=c++17 -std=gnu++17 -O3 -Wno-type-limits -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -Wno-format -Wno-missing-field-initializers
-core_unbuild_flags = -std=gnu++11
+core_build_flags = -std=gnu++2a -O3 -flto=auto -Wno-type-limits -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -Wno-format -Wno-missing-field-initializers
+core_unbuild_flags = -std=gnu++11 -std=gnu++14 -std=gnu++17 -fno-lto
 
 my_build_flags =
 
@@ -53,21 +53,13 @@ build_flags =
 unbuild_flags =
   ${common.core_unbuild_flags}
 
-; 4MB Flash variants
-[espressif32_base_4M]
-framework = arduino
-board_build.partitions = partitions/esp32_partition_4M.csv
-board_upload.flash_size = 4MB
-board_build.app_partition_name = app0
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2026.04.50/platform-espressif32.zip ; Platform 2026.04.50 Tasmota Arduino Core 3.3.8 based on IDF 5.5.4.260407
-
 ; 16MB Flash variants
 [espressif32_base_16M]
 framework = arduino
 board_build.partitions = partitions/esp32_partition_16M.csv
 board_upload.flash_size = 16MB
 board_build.app_partition_name = app0
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2026.04.50/platform-espressif32.zip ; Platform 2026.04.50 Tasmota Arduino Core 3.3.8 based on IDF 5.5.4.260407
+platform = espressif32@6.13.0 ; Arduino Core 2.0.17 / IDF 4.4.7
 
 ; 32MB Flash variants
 [espressif32_base_32M]
@@ -75,7 +67,29 @@ framework = arduino
 board_build.partitions = partitions/esp32_partition_32M.csv
 board_upload.flash_size = 32MB
 board_build.app_partition_name = app0
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2026.04.50/platform-espressif32.zip ; Platform 2026.04.50 Tasmota Arduino Core 3.3.8 based on IDF 5.5.4.260407
+platform = espressif32@6.13.0 ; Arduino Core 2.0.17 / IDF 4.4.7
+
+; use Tasmota's library for 4MB Flash variants.
+; Removes libs (like mbedtsl, so no WiFi_secure.h) to increase available heap
+[espressif32_base_T_4M]
+framework = arduino
+board_build.partitions = partitions/esp32_partition_4M.csv
+board_upload.flash_size = 4MB
+board_build.app_partition_name = app0
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.06.00/platform-espressif32.zip  ; Arduino Core 2.0.18 with IPv6 support, based on IDF 4.4.8
+; Tasmota Arduino Core 3.1.3.250302 based on IDF 5.3.2.250228
+; platform = https://github.com/tasmota/platform-espressif32/releases/download/2025.03.30/platform-espressif32.zip
+
+; use Tasmota's library for 16MB Flash variants.
+; Removes libs (like mbedtsl, so no WiFi_secure.h) to increase available heap
+[espressif32_base_T_16M]
+framework = arduino
+board_build.partitions = partitions/esp32_partition_16M.csv
+board_upload.flash_size = 16MB
+board_build.app_partition_name = app0
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.06.00/platform-espressif32.zip ; Arduino Core 2.0.18 with IPv6 support, based on IDF 4.4.8
+; Tasmota Arduino Core 3.1.3.250302 based on IDF 5.3.2.250228
+; platform = https://github.com/tasmota/platform-espressif32/releases/download/2025.03.30/platform-espressif32.zip
 
 [env]
 build_flags =
@@ -92,12 +106,10 @@ lib_deps =
   bblanchon/ArduinoJson @ 7.4.3
   ESP32Async/AsyncTCP @ 3.4.10
   ESP32Async/ESPAsyncWebServer @ 3.10.3
-  https://github.com/mobizt/ReadyMail.git @ 0.3.8
-  https://github.com/mobizt/ESP_SSLClient.git @ 3.1.3
   ; https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.8
 
 ; builds the web interface only, not the firmware
-[env:build_webUI]
+[env:build-webUI]
 platform = native
 targets = build
 extra_scripts = pre:scripts/build_interface.py
@@ -106,17 +118,18 @@ build_src_filter = -<*>
 
 ;
 ; Builds for different board types
+; We use Tasmota for boards without PSRAM as this framework has mbedtls removed to save memory.
 ; If you're building for a single target environment, we recommend creating a pio_local.ini (see example file)
 ;
 
 [env:s_4M]
-; 4MB ESP32 - no SSL, no PSRAM - like a BBQKees older S32 and E32 models
-extends = espressif32_base_4M
+; 4MB ESP32 - no SSL, no PSRAM - like a BBQKees older S32 and E32 models - uses Tasmota
+extends = espressif32_base_T_4M
 board = s_4M
 
 [env:s_16M]
-; 16MB ESP32 - no PSRAM - like a BBQKees later S32 V2 models
-extends = espressif32_base_16M
+; 16MB ESP32 - no PSRAM - like a BBQKees later S32 V2 models - uses Tasmota
+extends = espressif32_base_T_16M
 board = s_16M
 
 [env:s_16M_P]
@@ -135,30 +148,24 @@ extends = espressif32_base_32M
 board = s3_32M_P
 
 [env:s2_4M_P]
-; based on lolin_s2_mini 4MB with 2MB PSRAM
-extends = espressif32_base_4M
+; based on lolin_s2_mini 4MB with 2MB PSRAM - uses Tasmota
+extends = espressif32_base_T_4M
 board = s2_4M_P
 
 [env:c3_mini_4M]
-; based on lolin_c3_mini 4MB, no PSRAM
-extends = espressif32_base_4M
+; based on lolin_c3_mini 4MB, no PSRAM - uses Tasmota
+extends = espressif32_base_T_4M
 board = c3_mini_4M
 
 ; lolin C3 mini v1 needs special wifi initialization
 ; https://www.wemos.cc/en/latest/c3/c3_mini_1_0_0.html#about-wifi
 [env:c3_miniv1_4M]
-extends = espressif32_base_4M
+extends = espressif32_base_T_4M
 board = c3_mini_4M
 build_flags =
   ${common.build_flags}
   -DBOARD_C3_MINI_V1
 
-; XIAO ESP32C - 512KB SRAM & 4MB Flash - https://wiki.seeedstudio.com/xiao_esp32c6_getting_started/
-[env:c6_xiao_4M]
-extends = espressif32_base_4M
-board_build.app_partition_name = app0
-board = seeed_xiao_esp32c6
-
 ; foundation for building and testing natively, standalone without an ESP32
 ; use the `standalone` environment instead of `native` for testing
 [env:native]
@@ -168,8 +175,7 @@ build_flags =
 build_src_flags =
   -DEMSESP_STANDALONE -DEMSESP_TEST
   -DARDUINOJSON_ENABLE_ARDUINO_STRING=1
-  -DNO_TLS_SUPPORT
-  -std=gnu++17 -Og -ggdb
+  -std=gnu++2a -Og -ggdb
   -Wall -Wextra
   -Wno-unused-parameter -Wno-sign-compare -Wno-missing-braces
   -Wno-vla-cxx-extension -Wno-tautological-constant-out-of-range-compare
@@ -178,7 +184,6 @@ build_src_flags =
   -I./lib/uuid-common/src
   -I./lib/uuid-console/src
   -I./lib/uuid-log/src
-  -I./lib/semver
   -I./lib/PButton
   -I./lib/espMqttClient/src
   -I./lib/espMqttClient/src/Transport
@@ -208,9 +213,8 @@ build_src_flags =
   -DEMSESP_STANDALONE -DEMSESP_TEST
   -DEMSESP_UNITY
   -DARDUINOJSON_ENABLE_ARDUINO_STRING=1
-  -DNO_TLS_SUPPORT
   -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
-  -std=gnu++17 -Og -ggdb
+  -std=gnu++2a -Og -ggdb
   -Wall -Wextra
   -Wno-unused-parameter -Wno-sign-compare -Wno-missing-braces
   -Wno-vla-cxx-extension -Wno-tautological-constant-out-of-range-compare
@@ -219,7 +223,6 @@ build_src_flags =
   -I./lib/uuid-common/src
   -I./lib/uuid-console/src
   -I./lib/uuid-log/src
-  -I./lib/semver
   -I./lib/PButton
   -I./lib/espMqttClient/src
   -I./lib/espMqttClient/src/Transport

scripts/build_interface.py

@@ -74,7 +74,7 @@ def buildWeb():
         # Run pnpm commands in the interface directory
         commands = [
             f"{pnpm_exe} install",
-            f"{pnpm_exe} build_webUI"
+            f"{pnpm_exe} build-webUI"
         ]
 
         for command in commands:

scripts/update_all.sh

@@ -20,7 +20,7 @@ pnpm format
 
 cd ..
 cd interface
-pnpm build_webUI
+pnpm build-webUI
 
 cd ..
 npx cspell "**"

src/ESP32React/APSettingsService.cpp

@@ -10,6 +10,7 @@ APSettingsService::APSettingsService(AsyncWebServer * server, FS * fs, SecurityM
     , _reconfigureAp(false)
     , _connected(0) {
     addUpdateHandler([this] { reconfigureAP(); }, false);
+    WiFi.onEvent([this](WiFiEvent_t event, WiFiEventInfo_t info) { WiFiEvent(event); });
 }
 
 void APSettingsService::begin() {
@@ -18,27 +19,39 @@ void APSettingsService::begin() {
     // reconfigureAP();
 }
 
+// wait 10 sec on STA disconnect before starting AP
+void APSettingsService::WiFiEvent(WiFiEvent_t event) {
+    const uint8_t was_connected = _connected;
+    switch (event) {
+    case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
+        _connected &= ~1U;
+        break;
+    case ARDUINO_EVENT_ETH_DISCONNECTED:
+        _connected &= ~2U;
+        break;
+    case ARDUINO_EVENT_WIFI_STA_GOT_IP:
+    case ARDUINO_EVENT_WIFI_STA_GOT_IP6:
+        _connected |= 1U;
+        break;
+    case ARDUINO_EVENT_ETH_GOT_IP:
+    case ARDUINO_EVENT_ETH_GOT_IP6:
+        _connected |= 2U;
+        break;
+    default:
+        return;
+    }
+    // wait 10 sec before starting AP
+    if (was_connected && !_connected) {
+        _lastManaged = uuid::get_uptime();
+    }
+}
+
 void APSettingsService::reconfigureAP() {
     _lastManaged   = uuid::get_uptime() - MANAGE_NETWORK_DELAY;
     _reconfigureAp = true;
 }
 
 void APSettingsService::loop() {
-    const uint8_t was_connected = _connected;
-    if (WiFi.isConnected()) {
-        _connected |= 1U;
-    } else {
-        _connected &= ~1U;
-    }
-    if (ETH.connected()) {
-        _connected |= 2U;
-    } else {
-        _connected &= ~2U;
-    }
-    // wait 10 sec before starting AP
-    if (was_connected && !_connected) {
-        _lastManaged = uuid::get_uptime();
-    }
     const unsigned long currentMillis = uuid::get_uptime();
     if ((currentMillis - _lastManaged) >= MANAGE_NETWORK_DELAY) {
         _lastManaged = currentMillis;
@@ -63,7 +76,11 @@ void APSettingsService::manageAP() {
 }
 
 void APSettingsService::startAP() {
+#if ESP_IDF_VERSION_MAJOR < 5
+    WiFi.softAPenableIpV6(); // force IPV6, same as for WiFi - fixes https://github.com/emsesp/EMS-ESP32/issues/1922
+#else
     WiFi.softAPenableIPv6(); // force IPV6, same as for WiFi - fixes https://github.com/emsesp/EMS-ESP32/issues/1922
+#endif
     WiFi.softAPConfig(_state.localIP, _state.gatewayIP, _state.subnetMask);
     esp_wifi_set_bandwidth(static_cast<wifi_interface_t>(ESP_IF_WIFI_AP), WIFI_BW_HT20);
     WiFi.softAP(_state.ssid.c_str(), _state.password.c_str(), _state.channel, _state.ssidHidden, _state.maxClients);

src/ESP32React/APSettingsService.h

@@ -104,6 +104,7 @@ class APSettingsService : public StatefulService<APSettings> {
     void startAP();
     void stopAP();
     void handleDNS();
+    void WiFiEvent(WiFiEvent_t event);
 };
 
 #endif

src/ESP32React/ESP32React.cpp

@@ -2,10 +2,75 @@
 
 #include "WWWData.h" // include auto-generated static web resources
 
+#include <string.h>
+
 static constexpr const char CACHE_CONTROL[] = "public,max-age=60";
 
+// Single static-content handler serving all assets embedded in WWWData.h.
+class StaticContentHandler : public AsyncWebHandler {
+  public:
+    bool canHandle(AsyncWebServerRequest * request) const override {
+        const auto method = request->method();
+        return method == HTTP_GET || method == HTTP_HEAD || method == HTTP_OPTIONS;
+    }
+
+    void handleRequest(AsyncWebServerRequest * request) override {
+        // OPTIONS is handled generically - the server-level CORS headers are
+        // attached via DefaultHeaders in ESP32React::begin().
+        if (request->method() == HTTP_OPTIONS) {
+            request->send(200);
+            return;
+        }
+
+        const char *     url   = request->url().c_str();
+        const WWWAsset * found = lookup(url);
+        const WWWAsset * asset = found ? found : index_asset();
+
+        if (asset == nullptr) {
+            request->send(404);
+            return;
+        }
+
+        // If the client already has this exact ETag, respond 304 Not Modified without sending the body.
+        const String & inm = request->header(asyncsrv::T_INM);
+        if (inm.length() != 0 && strcmp(inm.c_str(), asset->etag) == 0) {
+            request->send(304);
+            return;
+        }
+
+        AsyncWebServerResponse * response = request->beginResponse(200, asset->contentType, asset->content, asset->len);
+        response->addHeader(asyncsrv::T_Content_Encoding, asyncsrv::T_gzip, false);
+        response->addHeader(asyncsrv::T_ETag, asset->etag, false);
+        response->addHeader(asyncsrv::T_Cache_Control, CACHE_CONTROL, false);
+        request->send(response);
+    }
+
+  private:
+    // Exact-match lookup in the asset table
+    static const WWWAsset * lookup(const char * url) {
+        for (size_t i = 0; i < WWW_ASSETS_COUNT; i++) {
+            if (strcmp(WWW_ASSETS[i].uri, url) == 0) {
+                return &WWW_ASSETS[i];
+            }
+        }
+        return nullptr;
+    }
+
+    // Returns the /index.html asset, used as the SPA fallback for any GET
+    // that didn't match an embedded asset (React Router handles routing on
+    // the client side).
+    static const WWWAsset * index_asset() {
+        static const WWWAsset * cached = nullptr;
+        if (cached == nullptr) {
+            cached = lookup("/index.html");
+        }
+        return cached;
+    }
+};
+
 ESP32React::ESP32React(AsyncWebServer * server, FS * fs)
-    : _securitySettingsService(server, fs)
+    : _server(server)
+    , _securitySettingsService(server, fs)
     , _networkSettingsService(server, fs, &_securitySettingsService)
     , _wifiScanner(server, &_securitySettingsService)
     , _networkStatus(server, &_securitySettingsService)
@@ -17,50 +82,6 @@ ESP32React::ESP32React(AsyncWebServer * server, FS * fs)
     , _mqttSettingsService(server, fs, &_securitySettingsService)
     , _mqttStatus(server, &_mqttSettingsService, &_securitySettingsService)
     , _authenticationService(server, &_securitySettingsService) {
-    //
-    // Serve static web resources
-    //
-
-    ArRequestHandlerFunction indexHtmlHandler = nullptr;
-
-    WWWData::registerRoutes([server, &indexHtmlHandler](const char * uri, const String & contentType, const uint8_t * content, size_t len, const String & hash) {
-        String etag = "\"" + hash + "\""; // RFC9110: ETag must be enclosed in double quotes
-
-        ArRequestHandlerFunction requestHandler = [contentType, content, len, etag](AsyncWebServerRequest * request) {
-            if (request->header(asyncsrv::T_INM) == etag) {
-                request->send(304);
-                return;
-            }
-
-            AsyncWebServerResponse * response = request->beginResponse(200, contentType, content, len);
-            response->addHeader(asyncsrv::T_Content_Encoding, asyncsrv::T_gzip, false);
-            response->addHeader(asyncsrv::T_ETag, etag, false);
-            response->addHeader(asyncsrv::T_Cache_Control, CACHE_CONTROL, false);
-            request->send(response);
-        };
-
-        server->on(uri, HTTP_GET, requestHandler);
-
-        // Capture index.html handler to set onNotFound once after all routes are registered
-        if (strcmp(uri, "/index.html") == 0) {
-            indexHtmlHandler = requestHandler;
-        }
-    });
-
-    // Set onNotFound handler once after all routes are registered
-    // Serving non matching get requests with "/index.html"
-    // OPTIONS get a straight up 200 response
-    if (indexHtmlHandler != nullptr) {
-        server->onNotFound([indexHtmlHandler](AsyncWebServerRequest * request) {
-            if (request->method() == HTTP_GET) {
-                indexHtmlHandler(request);
-            } else if (request->method() == HTTP_OPTIONS) {
-                request->send(200);
-            } else {
-                request->send(404); // not found
-            }
-        });
-    }
 }
 
 void ESP32React::begin() {
@@ -78,11 +99,11 @@ void ESP32React::begin() {
     _ntpSettingsService.begin();
     _mqttSettingsService.begin();
     _securitySettingsService.begin();
+    _server->addHandler(new StaticContentHandler());
 }
 
 void ESP32React::loop() {
     _networkSettingsService.loop();
     _apSettingsService.loop();
     _mqttSettingsService.loop();
-    _ntpSettingsService.loop();
-}
+}

src/ESP32React/ESP32React.h

@@ -68,6 +68,7 @@ class ESP32React {
     }
 
   private:
+    AsyncWebServer *        _server;
     SecuritySettingsService _securitySettingsService;
     NetworkSettingsService  _networkSettingsService;
     WiFiScanner             _wifiScanner;

src/ESP32React/MqttSettingsService.cpp

@@ -9,6 +9,7 @@ MqttSettingsService::MqttSettingsService(AsyncWebServer * server, FS * fs, Secur
     , _disconnectedAt(0)
     , _disconnectReason(espMqttClientTypes::DisconnectReason::TCP_DISCONNECTED)
     , _mqttClient(nullptr) {
+    WiFi.onEvent([this](WiFiEvent_t event, WiFiEventInfo_t info) { WiFiEvent(event); });
     addUpdateHandler([this] { onConfigUpdated(); }, false);
 }
 
@@ -28,7 +29,6 @@ MqttSettingsService::~MqttSettingsService() {
 void MqttSettingsService::begin() {
     _fsPersistence.readFromFS();
     startClient();
-    _reconfigureMqtt = true;
 }
 
 void MqttSettingsService::startClient() {
@@ -41,7 +41,7 @@ void MqttSettingsService::startClient() {
         delete _mqttClient;
         _mqttClient = nullptr;
     }
-#ifndef NO_TLS_SUPPORT
+#ifndef TASMOTA_SDK
     if (_state.enableTLS) {
         isSecure = true;
         if (emsesp::EMSESP::system_.PSram() == 0) {
@@ -79,10 +79,6 @@ void MqttSettingsService::startClient() {
 }
 
 void MqttSettingsService::loop() {
-    if (_state.enabled && _mqttClient && _mqttClient->connected() && !emsesp::EMSESP::system_.network_connected()) {
-        // emsesp::EMSESP::logger().info("Network connection dropped, stopping MQTT client");
-        _mqttClient->disconnect(true);
-    }
     if (_reconfigureMqtt || (_disconnectedAt && static_cast<uint32_t>(uuid::get_uptime() - _disconnectedAt) >= MQTT_RECONNECTION_DELAY)) {
         // reconfigure MQTT client
         _disconnectedAt  = configureMqtt() ? 0 : uuid::get_uptime();
@@ -146,6 +142,28 @@ void MqttSettingsService::onConfigUpdated() {
     emsesp::EMSESP::mqtt_.start(); // reload EMS-ESP MQTT settings
 }
 
+void MqttSettingsService::WiFiEvent(WiFiEvent_t event) {
+    switch (event) {
+    case ARDUINO_EVENT_WIFI_STA_GOT_IP:
+    case ARDUINO_EVENT_ETH_GOT_IP:
+    case ARDUINO_EVENT_ETH_GOT_IP6:
+    case ARDUINO_EVENT_WIFI_STA_GOT_IP6:
+        if (_state.enabled && !_mqttClient->connected()) {
+            onConfigUpdated();
+        }
+        break;
+    case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
+    case ARDUINO_EVENT_ETH_DISCONNECTED:
+        if (_state.enabled) {
+            _mqttClient->disconnect(true);
+        }
+        break;
+
+    default:
+        break;
+    }
+}
+
 bool MqttSettingsService::configureMqtt() {
     // disconnect if already connected
     if (_mqttClient->connected()) {
@@ -164,7 +182,7 @@ bool MqttSettingsService::configureMqtt() {
         }
 
         _reconfigureMqtt = false;
-#ifndef NO_TLS_SUPPORT
+#ifndef TASMOTA_SDK
         if (_state.enableTLS) {
             if (_state.rootCA == "insecure") {
                 emsesp::EMSESP::logger().debug("Start insecure MQTT");
@@ -201,7 +219,7 @@ bool MqttSettingsService::configureMqtt() {
 }
 
 void MqttSettings::read(MqttSettings & settings, JsonObject root) {
-#ifndef NO_TLS_SUPPORT
+#ifndef TASMOTA_SDK
     root["enableTLS"] = settings.enableTLS;
     root["rootCA"]    = settings.rootCA;
 #endif
@@ -240,7 +258,7 @@ StateUpdateResult MqttSettings::update(JsonObject root, MqttSettings & settings)
     MqttSettings newSettings;
     bool         changed = false;
 
-#ifndef NO_TLS_SUPPORT
+#ifndef TASMOTA_SDK
     newSettings.enableTLS = root["enableTLS"];
     newSettings.rootCA    = root["rootCA"] | "";
 #else
@@ -371,7 +389,7 @@ StateUpdateResult MqttSettings::update(JsonObject root, MqttSettings & settings)
         emsesp::EMSESP::mqtt_.set_publish_time_heartbeat(newSettings.publish_time_heartbeat);
     }
 
-#ifndef NO_TLS_SUPPORT
+#ifndef TASMOTA_SDK
     // strip down to certificate only
     newSettings.rootCA.replace("\r", "");
     newSettings.rootCA.replace("\n", "");

src/ESP32React/MqttSettingsService.h

@@ -134,6 +134,7 @@ class MqttSettingsService : public StatefulService<MqttSettings> {
     // the MQTT client instance
     MqttClient * _mqttClient;
 
+    void WiFiEvent(WiFiEvent_t event);
     void onMqttConnect(bool sessionPresent);
     void onMqttDisconnect(espMqttClientTypes::DisconnectReason reason);
     void

src/ESP32React/NTPSettingsService.cpp

@@ -11,6 +11,7 @@ NTPSettingsService::NTPSettingsService(AsyncWebServer * server, FS * fs, Securit
         configureTime(request, json);
     });
 
+    WiFi.onEvent([this](WiFiEvent_t event, WiFiEventInfo_t info) { WiFiEvent(event); });
     addUpdateHandler([this] { configureNTP(); }, false);
 }
 
@@ -19,10 +20,27 @@ void NTPSettingsService::begin() {
     configureNTP();
 }
 
-void NTPSettingsService::loop() {
-    if (_connected != emsesp::EMSESP::system_.network_connected()) {
-        _connected = emsesp::EMSESP::system_.network_connected();
+// handles both WiFI and Ethernet
+void NTPSettingsService::WiFiEvent(WiFiEvent_t event) {
+    switch (event) {
+    case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
+    case ARDUINO_EVENT_ETH_DISCONNECTED:
+        if (_connected && emsesp::EMSESP::system_.ntp_connected()) {
+            emsesp::EMSESP::logger().info("WiFi connection dropped, stopping NTP");
+            _connected = false;
+            configureNTP();
+        }
+        break;
+
+    case ARDUINO_EVENT_WIFI_STA_GOT_IP:
+    case ARDUINO_EVENT_ETH_GOT_IP:
+        // emsesp::EMSESP::logger().info("Got IP address, starting NTP synchronization");
+        _connected = true;
         configureNTP();
+        break;
+
+    default:
+        break;
     }
 }
 
@@ -37,9 +55,7 @@ void NTPSettingsService::configureNTP() {
     } else {
         setenv("TZ", _state.tzFormat.c_str(), 1);
         tzset();
-        if (esp_sntp_enabled()) {
-            esp_sntp_stop();
-        }
+        esp_sntp_stop();
     }
 }
 
@@ -52,12 +68,7 @@ void NTPSettingsService::configureTime(AsyncWebServerRequest * request, JsonVari
             tm.tm_isdst         = -1; // not set by strptime, tells mktime to determine daylightsaving
             time_t         time = mktime(&tm);
             struct timeval now  = {.tv_sec = time, .tv_usec = {}};
-#if CONFIG_IDF_TARGET_ESP32C3
-           // settimeofday and adjtime() does not work, unknown how to set time
-            emsesp::EMSESP::logger().warning("manual clock setting not possible");
-#else
             settimeofday(&now, nullptr);
-#endif
             AsyncWebServerResponse * response = request->beginResponse(200);
             request->send(response);
             return;

src/ESP32React/NTPSettingsService.h

@@ -44,7 +44,6 @@ class NTPSettingsService : public StatefulService<NTPSettings> {
     NTPSettingsService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager);
 
     void        begin();
-    void        loop();
     static void ntp_received(struct timeval * tv);
 
   private:
@@ -52,6 +51,7 @@ class NTPSettingsService : public StatefulService<NTPSettings> {
     FSPersistence<NTPSettings> _fsPersistence;
     volatile bool              _connected;
 
+    void WiFiEvent(WiFiEvent_t event);
     void configureNTP();
     void configureTime(AsyncWebServerRequest * request, JsonVariant json);
 };

src/ESP32React/NetworkSettingsService.cpp

@@ -9,7 +9,7 @@ NetworkSettingsService::NetworkSettingsService(AsyncWebServer * server, FS * fs,
     , _stopping(false) {
     addUpdateHandler([this] { reconfigureWiFiConnection(); }, false);
     // Eth is also bound to the WifiGeneric event handler
-    // Network.onEvent([this](arduino_event_id_t event, arduino_event_info_t info) { WiFiEvent(event, info); });
+    WiFi.onEvent([this](WiFiEvent_t event, WiFiEventInfo_t info) { WiFiEvent(event, info); });
 }
 
 static bool formatBssid(const String & bssid, uint8_t (&mac)[6]) {
@@ -34,8 +34,8 @@ void NetworkSettingsService::begin() {
     WiFi.persistent(false);
     WiFi.setAutoReconnect(false);
 
-    WiFi.mode(WIFI_STA);
-    WiFi.mode(WIFI_OFF);
+    WiFi.mode(WIFI_MODE_MAX);
+    WiFi.mode(WIFI_MODE_NULL);
 
     // scan settings give connect issues since arduino 2.0.14 and arduino 3.x.x with some wifi systems
     // WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); // default is FAST_SCAN
@@ -62,118 +62,24 @@ void NetworkSettingsService::loop() {
         _lastConnectionAttempt = currentMillis;
         manageSTA();
     }
-    static uint8_t connect = 0;
-    enum uint8_t {
-        CONNECT_IDLE = 0,
-        CONNECT_WAIT_ETH,
-        CONNECT_WAIT_IP4,
-        CONNECT_WAIT_ETH_IP4,
-        CONNECT_WAIT_IP6,
-        CONNECT_WAIT_ETH_IP6,
-        CONNECT_ETH_ACTIVE,
-        CONNECT_WIFI_ACTIVE
-    };
-    switch (connect) {
-    default:
-        connect = CONNECT_IDLE;
-        break;
-    case CONNECT_IDLE:
-        if (ETH.started() && _state.ssid.length() == 0) {
-            emsesp::EMSESP::logger().info("ETH started");
-            ETH.enableIPv6(true);
-            if (_state.staticIPConfig) {
-                ETH.config(_state.localIP, _state.gatewayIP, _state.subnetMask, _state.dnsIP1, _state.dnsIP2);
-            }
-            ETH.setHostname(emsesp::EMSESP::system_.hostname().c_str());
-            connect = CONNECT_WAIT_ETH;
-        }
-        if (WiFi.isConnected()) {
-            emsesp::EMSESP::logger().info("Wifi connected");
-            if (_state.tx_power == 0) {
-                setWiFiPowerOnRSSI();
-            }
-            mDNS_start();
-            emsesp::EMSESP::system_.has_ipv6(true);
-            connect = CONNECT_WAIT_IP4;
-        }
-        break;
-    case CONNECT_WAIT_ETH:
-        if (ETH.connected()) {
-            emsesp::EMSESP::logger().info("ETH connected");
-            emsesp::EMSESP::system_.ethernet_connected(true);
-            mDNS_start();
-            emsesp::EMSESP::system_.has_ipv6(true);
-            connect = CONNECT_WAIT_ETH_IP4;
-        }
-        break;
-    case CONNECT_WAIT_ETH_IP4:
-        if (ETH.hasIP()) {
-            emsesp::EMSESP::logger().info("ETH IPv4: %s", ETH.localIP().toString().c_str());
-            connect = CONNECT_WAIT_ETH_IP6;
-        }
-        if (!ETH.connected()) {
-            connect = CONNECT_ETH_ACTIVE;
-        }
-        break;
-    case CONNECT_WAIT_ETH_IP6:
-        if (ETH.hasLinkLocalIPv6() && ETH.hasGlobalIPv6()) {
-            emsesp::EMSESP::system_.has_ipv6(true);
-            connect = CONNECT_ETH_ACTIVE;
-        }
-        if (!ETH.connected()) {
-            connect = CONNECT_ETH_ACTIVE;
-        }
-        break;
-    case CONNECT_ETH_ACTIVE:
-        if (!ETH.connected()) {
-            emsesp::EMSESP::logger().info("ETH disconnected");
-            emsesp::EMSESP::system_.ethernet_connected(false);
-            emsesp::EMSESP::system_.has_ipv6(false);
-            connect = CONNECT_IDLE;
-        }
-        break;
-    case CONNECT_WAIT_IP4:
-        if (!WiFi.localIP().toString().isEmpty()) {
-            emsesp::EMSESP::logger().info("Wifi IPv4: %s", WiFi.localIP().toString().c_str());
-            connect = CONNECT_WAIT_IP6;
-        }
-        if (!WiFi.isConnected()) {
-            connect = CONNECT_ETH_ACTIVE;
-        }
-        break;
-    case CONNECT_WAIT_IP6:
-        if (WiFi.linkLocalIPv6().toString() != "::" && WiFi.globalIPv6().toString() != "::") {
-            emsesp::EMSESP::logger().info("Wifi IPv6: %s, %s", WiFi.linkLocalIPv6().toString().c_str(), WiFi.globalIPv6().toString().c_str());
-            emsesp::EMSESP::system_.has_ipv6(true);
-            connect = CONNECT_WIFI_ACTIVE;
-        }
-        if (!WiFi.isConnected()) {
-            connect = CONNECT_WIFI_ACTIVE;
-        }
-        break;
-    case CONNECT_WIFI_ACTIVE:
-        if (!WiFi.isConnected()) {
-            emsesp::EMSESP::logger().info("WiFi disconnected");
-            if (_stopping) {
-                _lastConnectionAttempt = 0;
-                _stopping              = false;
-            }
-            emsesp::EMSESP::system_.has_ipv6(false);
-            connect = CONNECT_IDLE;
-        }
-        break;
-    }
 }
 
 void NetworkSettingsService::manageSTA() {
     // Abort if already connected, or if we have no SSID
     if (WiFi.isConnected() || _state.ssid.length() == 0) {
+#if ESP_IDF_VERSION_MAJOR >= 5
+        if (_state.ssid.length() == 0) {
+            ETH.enableIPv6(true);
+        }
+#endif
         return;
     }
 
     // Connect or reconnect as required
     if ((WiFi.getMode() & WIFI_STA) == 0) {
+#if ESP_IDF_VERSION_MAJOR >= 5
         WiFi.enableIPv6(true);
+#endif
         if (_state.staticIPConfig) {
             WiFi.config(_state.localIP, _state.gatewayIP, _state.subnetMask, _state.dnsIP1, _state.dnsIP2); // configure for static IP
         }
@@ -387,7 +293,7 @@ const char * NetworkSettingsService::disconnectReason(uint8_t code) {
 }
 
 // handles both WiFI and Ethernet
-void NetworkSettingsService::WiFiEvent(arduino_event_id_t event, arduino_event_info_t info) {
+void NetworkSettingsService::WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
 #ifndef EMSESP_STANDALONE
 
     switch (event) {
@@ -399,7 +305,7 @@ void NetworkSettingsService::WiFiEvent(arduino_event_id_t event, arduino_event_i
         break;
 
     case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
-        connectcount_ = connectcount_ + 1; // count the number of WiFi reconnects
+        connectcount_++; // count the number of WiFi reconnects
         emsesp::EMSESP::logger().warning("WiFi disconnected (#%d). Reason: %s (%d)",
                                          connectcount_,
                                          disconnectReason(info.wifi_sta_disconnected.reason),
@@ -454,15 +360,25 @@ void NetworkSettingsService::WiFiEvent(arduino_event_id_t event, arduino_event_i
         if (_state.tx_power == 0) {
             setWiFiPowerOnRSSI();
         }
+#if ESP_IDF_VERSION_MAJOR < 5
+        WiFi.enableIpV6(); // force ipv6
+#endif
         break;
 
     case ARDUINO_EVENT_ETH_CONNECTED:
+#if ESP_IDF_VERSION_MAJOR < 5
+        ETH.enableIpV6(); // force ipv6
+#endif
         break;
 
         // IPv6 specific - WiFi/Eth
     case ARDUINO_EVENT_WIFI_STA_GOT_IP6:
     case ARDUINO_EVENT_ETH_GOT_IP6: {
-        auto         ip6  = IPAddress(IPv6, (uint8_t *)info.got_ip6.ip6_info.ip.addr, 0).toString();
+#if !TASMOTA_SDK && ESP_IDF_VERSION_MAJOR < 5
+        auto ip6 = IPv6Address((uint8_t *)info.got_ip6.ip6_info.ip.addr).toString();
+#else
+        auto ip6 = IPAddress(IPv6, (uint8_t *)info.got_ip6.ip6_info.ip.addr, 0).toString();
+#endif
         const char * link = event == ARDUINO_EVENT_ETH_GOT_IP6 ? "Eth" : "WiFi";
         if (ip6.startsWith("fe80")) {
             emsesp::EMSESP::logger().info("IPv6 (%s) local: %s", link, ip6.c_str());

src/ESP32React/NetworkSettingsService.h

@@ -107,7 +107,7 @@ class NetworkSettingsService : public StatefulService<NetworkSettings> {
 
     volatile uint16_t connectcount_ = 0; // number of wifi reconnects
 
-    void         WiFiEvent(arduino_event_id_t event, arduino_event_info_t info);
+    void         WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info);
     void         mDNS_start() const;
     const char * disconnectReason(uint8_t code);
     void         reconfigureWiFiConnection();

src/ESP32React/NetworkStatus.cpp

@@ -2,7 +2,7 @@
 
 #include <emsesp.h>
 
-#ifdef NO_TLS_SUPPORT
+#ifdef TASMOTA_SDK
 #include "lwip/dns.h"
 #endif
 
@@ -31,13 +31,22 @@ void NetworkStatus::networkStatus(AsyncWebServerRequest * request) {
     // for both connections show ethernet
     if (ethernet_connected) {
         // Ethernet
-        root["local_ip"]    = ETH.localIP().toString();
-        root["local_ipv6"]  = ETH.linkLocalIPv6().toString();
+        root["local_ip"] = ETH.localIP().toString();
+#if ESP_IDF_VERSION_MAJOR < 5
+        root["local_ipv6"] = ETH.localIPv6().toString();
+#else
+        root["local_ipv6"] = ETH.linkLocalIPv6().toString();
+#endif
         root["mac_address"] = ETH.macAddress();
         root["subnet_mask"] = ETH.subnetMask().toString();
         root["gateway_ip"]  = ETH.gatewayIP().toString();
-        IPAddress dnsIP1    = ETH.dnsIP(0);
-        IPAddress dnsIP2    = ETH.dnsIP(1);
+#ifdef TASMOTA_SDK
+        IPAddress dnsIP1 = IPAddress(dns_getserver(0));
+        IPAddress dnsIP2 = IPAddress(dns_getserver(1));
+#else
+        IPAddress dnsIP1 = ETH.dnsIP(0);
+        IPAddress dnsIP2 = ETH.dnsIP(1);
+#endif
         if (IPUtils::isSet(dnsIP1)) {
             root["dns_ip_1"] = dnsIP1.toString();
         }
@@ -45,8 +54,12 @@ void NetworkStatus::networkStatus(AsyncWebServerRequest * request) {
             root["dns_ip_2"] = dnsIP2.toString();
         }
     } else if (wifi_status == WL_CONNECTED) {
-        root["local_ip"]        = WiFi.localIP().toString();
-        root["local_ipv6"]      = WiFi.linkLocalIPv6().toString();
+        root["local_ip"] = WiFi.localIP().toString();
+#if ESP_IDF_VERSION_MAJOR < 5
+        root["local_ipv6"] = WiFi.localIPv6().toString();
+#else
+        root["local_ipv6"] = WiFi.linkLocalIPv6().toString();
+#endif
         root["mac_address"]     = WiFi.macAddress();
         root["rssi"]            = WiFi.RSSI();
         root["ssid"]            = WiFi.SSID();
@@ -58,8 +71,14 @@ void NetworkStatus::networkStatus(AsyncWebServerRequest * request) {
         if (WiFi.gatewayIP() != INADDR_NONE) {
             root["gateway_ip"] = WiFi.gatewayIP().toString();
         }
+
+#ifdef TASMOTA_SDK
+        IPAddress dnsIP1 = IPAddress(dns_getserver(0));
+        IPAddress dnsIP2 = IPAddress(dns_getserver(1));
+#else
         IPAddress dnsIP1 = WiFi.dnsIP(0);
         IPAddress dnsIP2 = WiFi.dnsIP(1);
+#endif
         if (dnsIP1 != INADDR_NONE) {
             root["dns_ip_1"] = dnsIP1.toString();
         }

src/core/EMSESP_Version.h

@@ -0,0 +1,126 @@
+/*
+ * EMS-ESP - https://github.com/emsesp/EMS-ESP
+ * Copyright 2020-2026  emsesp.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef EMSESP_Version_H
+#define EMSESP_Version_H
+
+#include <cstdio>
+#include <cstring>
+#include <string>
+
+// Drop-in lightweight replacement for the subset of the semver library actually used by EMS-ESP.
+// The previous semver library (lib/semver) builds a std::map + std::function-based state machine on
+// every parse, which fragments the internal heap on the ESP32. This replacement does no heap
+// allocation beyond the std::string member for the prerelease tag, and matches the API surface
+// we consume: construction from string, major()/minor()/patch()/prerelease(), and operator>/</==.
+//
+// Only strict numeric precedence (major.minor.patch) is used for comparison in EMS-ESP, so we
+// intentionally ignore prerelease tags during comparison rather than implement the full semver
+// ordering rules. This is consistent with how the old code was used (callers only check major/
+// minor/patch numerically; prerelease() is only read for logging).
+
+namespace version {
+
+class EMSESP_Version {
+  public:
+    EMSESP_Version() = default;
+
+    // Construct from a version string like "3.9.0-dev.14" or "3.9.0".
+    // Anything past a '-' or '+' is kept as the prerelease string and not interpreted.
+    explicit EMSESP_Version(const std::string & s) {
+        parse(s.c_str());
+    }
+
+    explicit EMSESP_Version(const char * s) {
+        parse(s ? s : "");
+    }
+
+    int major() const {
+        return major_;
+    }
+    int minor() const {
+        return minor_;
+    }
+    int patch() const {
+        return patch_;
+    }
+    const std::string & prerelease() const {
+        return prerelease_;
+    }
+
+    // Numeric-only comparison (major.minor.patch). Prerelease tags are ignored on purpose.
+    friend bool operator<(const EMSESP_Version & a, const EMSESP_Version & b) {
+        if (a.major_ != b.major_)
+            return a.major_ < b.major_;
+        if (a.minor_ != b.minor_)
+            return a.minor_ < b.minor_;
+        if (a.patch_ != b.patch_)
+            return a.patch_ < b.patch_;
+        return a.prerelease_ < b.prerelease_;
+    }
+
+    friend bool operator>(const EMSESP_Version & a, const EMSESP_Version & b) {
+        return b < a;
+    }
+
+    friend bool operator==(const EMSESP_Version & a, const EMSESP_Version & b) {
+        return a.major_ == b.major_ && a.minor_ == b.minor_ && a.patch_ == b.patch_ && a.prerelease_ == b.prerelease_;
+    }
+
+    friend bool operator!=(const EMSESP_Version & a, const EMSESP_Version & b) {
+        return !(a == b);
+    }
+
+    friend bool operator>=(const EMSESP_Version & a, const EMSESP_Version & b) {
+        return !(a < b);
+    }
+
+    friend bool operator<=(const EMSESP_Version & a, const EMSESP_Version & b) {
+        return !(b < a);
+    }
+
+  private:
+    int         major_ = 0;
+    int         minor_ = 0;
+    int         patch_ = 0;
+    std::string prerelease_;
+
+    void parse(const char * s) {
+        major_ = minor_ = patch_ = 0;
+        prerelease_.clear();
+        if (s == nullptr || *s == '\0') {
+            return;
+        }
+        // parse numeric major.minor.patch; accept partial ("3", "3.9", "3.9.0")
+        sscanf(s, "%d.%d.%d", &major_, &minor_, &patch_);
+        // capture prerelease tag after '-' if present (stop at '+' which is build metadata)
+        const char * dash = strchr(s, '-');
+        if (dash != nullptr) {
+            const char * plus = strchr(dash, '+');
+            if (plus != nullptr) {
+                prerelease_.assign(dash + 1, plus - dash - 1);
+            } else {
+                prerelease_.assign(dash + 1);
+            }
+        }
+    }
+};
+
+} // namespace version
+
+#endif

src/core/analogsensor.cpp

@@ -347,13 +347,23 @@ void AnalogSensor::reload(bool get_nvs) {
             sensor.polltime_ = sensor.value() != 0 ? uuid::get_uptime() + (sensor.factor() * 1000) : 0;
         } else if (sensor.type() >= AnalogType::PWM_0 && sensor.type() <= AnalogType::PWM_2) {
             LOG_DEBUG("PWM output on GPIO %02d", sensor.gpio());
+#if ESP_IDF_VERSION_MAJOR >= 5
             ledcAttach(sensor.gpio(), sensor.factor(), 13);
+#else
+            uint8_t channel = sensor.type() - AnalogType::PWM_0;
+            ledcSetup(channel, sensor.factor(), 13);
+            ledcAttachPin(sensor.gpio(), channel);
+#endif
             if (sensor.offset() > 100) {
                 sensor.set_offset(100);
             } else if (sensor.offset() < 0) {
                 sensor.set_offset(0);
             }
+#if ESP_IDF_VERSION_MAJOR >= 5
             ledcWrite(sensor.gpio(), (uint32_t)(sensor.offset() * 8191 / 100));
+#else
+            ledcWrite(channel, (uint32_t)(sensor.offset() * 8191 / 100));
+#endif
             sensor.set_value(sensor.offset());
             sensor.set_uom(DeviceValueUOM::PERCENT);
             publish_sensor(sensor);
@@ -1031,7 +1041,12 @@ bool AnalogSensor::command_setvalue(const char * value, const int8_t gpio) {
                 }
                 sensor.set_offset(val);
                 sensor.set_value(val);
+#if ESP_IDF_VERSION_MAJOR >= 5
                 ledcWrite(sensor.gpio(), (uint32_t)(sensor.offset() * 8191 / 100));
+#else
+                uint8_t channel = sensor.type() - AnalogType::PWM_0;
+                ledcWrite(channel, (uint32_t)(val * 8191 / 100));
+#endif
             } else {
                 return false;
             }

src/core/default_settings.h

@@ -285,8 +285,6 @@ enum {
 #define EMSESP_PLATFORM "ESP32S3"
 #elif CONFIG_IDF_TARGET_ESP32 || EMSESP_STANDALONE
 #define EMSESP_PLATFORM "ESP32"
-#elif CONFIG_IDF_TARGET_ESP32C6
-#define EMSESP_PLATFORM "ESP32C6"
 #else
 #error Target CONFIG_IDF_TARGET is not supported
 #endif
@@ -295,9 +293,12 @@ enum {
 #ifndef STRINGIZE
 #define STRINGIZE(s) #s
 #endif
-
+#ifdef TASMOTA_SDK
 #define ARDUINO_VERSION_STR(major, minor, patch) "Tasmota Arduino v" STRINGIZE(major) "." STRINGIZE(minor) "." STRINGIZE(patch)
+#else
+#define ARDUINO_VERSION_STR(major, minor, patch) "ESP32 Arduino v" STRINGIZE(major) "." STRINGIZE(minor) "." STRINGIZE(patch)
+#endif
 #define ARDUINO_VERSION ARDUINO_VERSION_STR(ESP_ARDUINO_VERSION_MAJOR, ESP_ARDUINO_VERSION_MINOR, ESP_ARDUINO_VERSION_PATCH)
+#endif
 
 #endif
-#endif

src/core/emsdevice.cpp

@@ -387,10 +387,10 @@ void EMSdevice::toggle_fetch(uint16_t telegram_id, bool toggle) {
 }
 
 // get status of automatic fetch for a telegramID
-bool EMSdevice::is_fetch(uint16_t telegram_id) const {
+bool EMSdevice::is_fetch(uint16_t telegram_id, uint8_t len) const {
     for (const auto & tf : telegram_functions_) {
         if (tf.telegram_type_id_ == telegram_id) {
-            return tf.fetch_;
+            return tf.fetch_ && tf.length_ >= len;
         }
     }
     return false;

src/core/emsdevice.h

@@ -362,7 +362,7 @@ class EMSdevice {
     const char * telegram_type_name(std::shared_ptr<const Telegram> telegram);
     void         fetch_values();
     void         toggle_fetch(uint16_t telegram_id, bool toggle);
-    bool         is_fetch(uint16_t telegram_id) const;
+    bool         is_fetch(uint16_t telegram_id, uint8_t len = 0) const;
     bool         is_received(uint16_t telegram_id) const;
     bool         has_telegram_id(uint16_t id) const;
     void         ha_config_clear();

src/core/emsfactory.h

@@ -19,6 +19,7 @@
 #ifndef EMSESP_EMSFACTORY_H_
 #define EMSESP_EMSFACTORY_H_
 
+#include <cstdint>
 #include <memory> // for unique_ptr
 #include <map>
 

src/core/shuntingYard.cpp

@@ -380,15 +380,11 @@ std::string commands(std::string & expr, bool quotes) {
             if (return_code != CommandRet::OK && return_code != CommandRet::NO_VALUE) {
                 return expr = "";
             }
-            std::string data;
-            if (output["api_data"].is<std::string>()) {
-                data = output["api_data"].as<std::string>();
-                if (!isnum(data) && quotes) {
-                    data.insert(data.begin(), '"');
-                    data.insert(data.end(), '"');
-                }
-            } else {
-                serializeJson(output, data);
+
+            std::string data = output["api_data"] | "";
+            if (!isnum(data) && quotes) {
+                data.insert(data.begin(), '"');
+                data.insert(data.end(), '"');
             }
             expr.replace(f, l, data);
             e        = f + data.length();
@@ -704,7 +700,8 @@ std::string compute(const std::string & expr) {
         std::string  cmd = expr_new.substr(f, e - f).c_str();
         JsonDocument doc;
         if (DeserializationError::Ok == deserializeJson(doc, cmd)) {
-            std::string url, header_s, value_s, method_s, key_s, keys_s;
+            HTTPClient * http = new HTTPClient;
+            std::string  url, header_s, value_s, method_s, key_s, keys_s;
             // search keys lower case
             for (JsonPair p : doc.as<JsonObject>()) {
                 if (Helpers::toLower(p.key().c_str()) == "url") {
@@ -723,150 +720,58 @@ std::string compute(const std::string & expr) {
                     keys_s = p.key().c_str();
                 }
             }
-            bool        content_set = false;
-            std::string value       = doc[value_s] | "";
-            std::string method      = doc[method_s] | "GET";
-            if (value.length()) {
-                method = "POST";
-            }
-            std::string result;
-            int         httpResult = 0;
-#ifndef NO_TLS_SUPPORT
-            if (Helpers::toLower(url.c_str()).starts_with("https://")) {
-                WiFiClient *    basic_client = new WiFiClient;
-                ESP_SSLClient * ssl_client   = new ESP_SSLClient;
-                ssl_client->setInsecure(); // with root CA we should set here: ssl_client->setCACert(rootCACert);
-                ssl_client->setBufferSizes(1024, 1024);
-                ssl_client->setSessionTimeout(120); // Set the timeout in seconds (>=120 seconds)
-                url.replace(0, 8, "");
-                std::string host  = url;
-                auto        index = url.find_first_of('/');
-                if (index != std::string::npos) {
-                    host = url.substr(0, index);
-                    url.replace(0, index, "");
+            if (http->begin(url.c_str())) {
+                int httpResult = 0;
+                for (JsonPair p : doc[header_s].as<JsonObject>()) {
+                    http->addHeader(p.key().c_str(), p.value().as<std::string>().c_str());
                 }
-                /*
-                index = host.find_first_of('@');
-                std::string auth;
-                if (index != std::string::npos) {
-                    auth = base64::encode(host.substr(0, index));
-                    host.replace(0, index, "");
+                std::string value  = doc[value_s] | "";
+                std::string method = doc[method_s] | "get";
+
+                // if there is data, force a POST
+                if (value.length() || Helpers::toLower(method) == "post") {
+                    if (value.find_first_of('{') != std::string::npos) {
+                        http->addHeader(asyncsrv::T_Content_Type, asyncsrv::T_application_json, false); // auto-set to JSON
+                    }
+                    httpResult = http->POST(value.c_str());
+                } else {
+                    httpResult = http->GET(); // normal GET
                 }
-                */
-                ssl_client->setClient(basic_client);
-                if (ssl_client->connect(host.c_str(), 443)) {
-                    if (value.length() || Helpers::toLower(method) == "post") {
-                        ssl_client->print("POST ");
-                        ssl_client->print(url.c_str());
-                        ssl_client->println(" HTTP/1.1");
-                        ssl_client->print("Host: ");
-                        ssl_client->println(host.c_str());
-                        for (JsonPair p : doc[header_s].as<JsonObject>()) {
-                            content_set |= (emsesp::Helpers::toLower(p.key().c_str()) == "content-type");
-                            ssl_client->print(p.key().c_str());
-                            ssl_client->print(": ");
-                            ssl_client->println(p.value().as<std::string>().c_str());
-                        }
-                        if (!content_set) {
-                            ssl_client->print("Content-Type: ");
-                            if (value.starts_with('{')) {
-                                ssl_client->println(asyncsrv::T_application_json);
+
+                if (httpResult > 0) {
+                    std::string  result = http->getString().c_str();
+                    std::string  key    = doc[key_s] | "";
+                    JsonDocument keys_doc; // JsonDocument to hold "keys" after doc is parsed with HTTP body
+                    if (doc[keys_s].is<JsonArray>()) {
+                        keys_doc.set(doc[keys_s].as<JsonArray>());
+                    }
+                    JsonArray keys = keys_doc.as<JsonArray>();
+
+                    if (key.length() || !keys.isNull()) {
+                        doc.clear();
+                        if (DeserializationError::Ok == deserializeJson(doc, result)) {
+                            if (key.length()) {
+                                result = doc[key.c_str()].as<std::string>();
                             } else {
-                                ssl_client->println(asyncsrv::T_text_plain);
+                                JsonVariant json = doc.as<JsonVariant>();
+                                for (JsonVariant keys_key : keys) {
+                                    if (keys_key.is<std::string>() && json.is<JsonObject>()) {
+                                        json = json[keys_key.as<std::string>()].as<JsonVariant>();
+                                    } else if (keys_key.is<int>() && json.is<JsonArray>()) {
+                                        json = json[keys_key.as<int>()].as<JsonVariant>();
+                                    } else {
+                                        break; // type mismatch
+                                    }
+                                }
+                                result = json.as<std::string>();
                             }
                         }
-                        ssl_client->print("Content-Length: ");
-                        ssl_client->println(value.length());
-                        ssl_client->println("Connection: close");
-                        ssl_client->print("\r\n");
-                        ssl_client->print(value.c_str());
-                    } else {
-                        ssl_client->print("GET ");
-                        ssl_client->print(url.c_str());
-                        ssl_client->println(" HTTP/1.1");
-                        ssl_client->print("Host: ");
-                        ssl_client->println(host.c_str());
-                        for (JsonPair p : doc[header_s].as<JsonObject>()) {
-                            ssl_client->print(p.key().c_str());
-                            ssl_client->print(": ");
-                            ssl_client->println(p.value().as<std::string>().c_str());
-                        }
-                        ssl_client->println("Connection: close");
-                    }
-                    auto ms = millis();
-                    while (!ssl_client->available() && millis() - ms < 3000) {
-                        delay(0);
-                    }
-                    while (ssl_client->available()) {
-                        result += (char)ssl_client->read();
-                    }
-                    ssl_client->stop();
-                    index = result.find_first_of(' ');
-                    if (index != std::string::npos) {
-                        httpResult = stoi(result.substr(index + 1, 3));
-                    }
-                    index = result.find("\r\n\r\n");
-                    if (index != std::string::npos) {
-                        result.replace(0, index + 4, "");
-                    }
-                }
-                delete ssl_client;
-                delete basic_client;
-            } else
-#endif
-                if (Helpers::toLower(url.c_str()).starts_with("http://")) {
-                HTTPClient * http = new HTTPClient;
-                if (http->begin(url.c_str())) {
-                    for (JsonPair p : doc[header_s].as<JsonObject>()) {
-                        http->addHeader(p.key().c_str(), p.value().as<std::string>().c_str());
-                        content_set |= (emsesp::Helpers::toLower(p.key().c_str()) == "content-type");
-                    }
-                    if (value.length() || Helpers::toLower(method) == "post") {
-                        if (!content_set) {
-                            http->addHeader("Content-Type", value.starts_with('{') ? asyncsrv::T_application_json : asyncsrv::T_text_plain);
-                        }
-                        httpResult = http->POST(value.c_str());
-                    } else {
-                        httpResult = http->GET(); // normal GET
-                    }
-                    if (httpResult > 0) {
-                        result = http->getString().c_str();
                     }
+                    expr_new.replace(f, e - f, result.c_str());
                 }
                 http->end();
                 delete http;
             }
-            if (httpResult == 200) {
-                std::string  key = doc[key_s] | "";
-                JsonDocument keys_doc; // JsonDocument to hold "keys" after doc is parsed with HTTP body
-                if (doc[keys_s].is<JsonArray>()) {
-                    keys_doc.set(doc[keys_s].as<JsonArray>());
-                }
-                JsonArray keys = keys_doc.as<JsonArray>();
-                if (key.length() || !keys.isNull()) {
-                    doc.clear();
-                    if (DeserializationError::Ok == deserializeJson(doc, result)) {
-                        if (key.length()) {
-                            result = doc[key.c_str()].as<std::string>();
-                        } else {
-                            JsonVariant json = doc.as<JsonVariant>();
-                            for (JsonVariant keys_key : keys) {
-                                if (keys_key.is<std::string>() && json.is<JsonObject>()) {
-                                    json = json[keys_key.as<std::string>()].as<JsonVariant>();
-                                } else if (keys_key.is<int>() && json.is<JsonArray>()) {
-                                    json = json[keys_key.as<int>()].as<JsonVariant>();
-                                } else {
-                                    break; // type mismatch
-                                }
-                            }
-                            result = json.as<std::string>();
-                        }
-                    }
-                }
-                expr_new.replace(f, e - f, result);
-            } else if (httpResult != 0) {
-                EMSESP::logger().warning("URL command failed with https code: %d, response: %s", httpResult, result.c_str());
-            }
         }
         f = expr_new.find_first_of('{', e);
     }

src/core/system.cpp

@@ -26,27 +26,17 @@
 #include <esp_mac.h>
 #include "esp_efuse.h"
 #include <nvs.h>
-#include <mbedtls/base64.h>
 #endif
 
 #include <HTTPClient.h>
 #include <map>
 
-#include <semver200.h>
+#include "EMSESP_Version.h"
 
 #if defined(EMSESP_TEST)
 #include "../test/test.h"
 #endif
 
-#ifndef NO_TLS_SUPPORT
-#define ENABLE_SMTP
-#define USE_ESP_SSLCLIENT
-#define READYCLIENT_SSL_CLIENT ESP_SSLClient
-#define READYCLIENT_TYPE_1 // TYPE 1 when using ESP_SSLClient
-#include <ESP_SSLClient.h>
-#include <ReadyMail.h>
-#endif
-
 namespace emsesp {
 
 // Languages supported. Note: the order is important
@@ -115,115 +105,6 @@ bool System::command_send(const char * value, const int8_t id) {
     return EMSESP::txservice_.send_raw(value); // ignore id
 }
 
-bool System::command_sendmail(const char * value, const int8_t id) {
-    bool     enabled = false;
-    bool     ssl, starttls;
-    uint16_t port;
-    String   server, login, pass, sender, recp, subject;
-    EMSESP::webSettingsService.read([&](WebSettings & settings) {
-        enabled  = settings.email_enabled;
-        ssl      = settings.email_ssl;
-        starttls = settings.email_starttls;
-        server   = settings.email_server;
-        port     = settings.email_port;
-        login    = settings.email_login;
-        pass     = settings.email_pass;
-        sender   = settings.email_sender;
-        recp     = settings.email_recp;
-        subject  = settings.email_subject;
-    });
-    if (!enabled) {
-        return false;
-    }
-    LOG_DEBUG("Command sendmail port %d%s called with '%s'", port, ssl ? " (SSL)" : starttls ? " (STARTTLS)" : "", value);
-    // LOG_DEBUG("Command sendmail port %d called with '%s'", port, value);
-    bool success = false;
-
-#ifndef NO_TLS_SUPPORT
-    WiFiClient *    basic_client = new WiFiClient;
-    ESP_SSLClient * ssl_client   = new ESP_SSLClient;
-    ReadyClient *   r_client     = new ReadyClient(*ssl_client);
-    SMTPClient *    smtp         = new SMTPClient(*r_client);
-
-    ssl_client->setClient(basic_client);
-    ssl_client->setInsecure();
-    ssl_client->setBufferSizes(1024, 1024);
-    r_client->addPort(port, starttls ? readymail_protocol_tls : ssl ? readymail_protocol_ssl : readymail_protocol_plain_text);
-
-    // smtp->connect(server, port, sendmailCallback);
-    smtp->connect(server, port);
-    if (!smtp->isConnected()) {
-        LOG_ERROR("Sendmail connection error");
-        delete smtp;
-        delete r_client;
-        delete ssl_client;
-        delete basic_client;
-        return false;
-    }
-
-    // LOG_INFO("authenticate %s:%s", login.c_str(), pass.c_str());
-    smtp->authenticate(login, pass, readymail_auth_password);
-    if (!smtp->isAuthenticated()) {
-        LOG_ERROR("Sendmail authenticate error");
-        delete smtp;
-        delete r_client;
-        delete ssl_client;
-        delete basic_client;
-        return false;
-    }
-    JsonDocument doc;
-    String       body = value;
-    if (body.length()) {
-        auto error = deserializeJson(doc, (const char *)value);
-        if (!error && doc.as<JsonObject>().size() >= 0) {
-            subject = doc["subject"] | subject;
-            recp    = doc["to"] | recp;
-            sender  = doc["from"] | sender;
-            body    = doc["body"] | body;
-        }
-    }
-
-    SMTPMessage & msg = smtp->getMessage();
-    msg.headers.add(rfc822_subject, subject);
-    msg.headers.add(rfc822_from, sender);
-    msg.headers.add(rfc822_to, recp);
-
-    // Use addCustom to add custom header e.g. Importance and Priority.
-    // msg.headers.addCustom("Importance", PRIORITY);
-    // msg.headers.addCustom("X-MSMail-Priority", PRIORITY);
-    // msg.headers.addCustom("X-Priority", PRIORITY_NUM);
-    EMSESP::webSchedulerService.computed_value.clear();
-    EMSESP::webSchedulerService.raw_value = body.c_str();
-    for (uint16_t wait = 0; wait < 2000 && !EMSESP::webSchedulerService.raw_value.empty(); wait++) {
-        delay(1);
-    }
-    if (!EMSESP::webSchedulerService.computed_value.empty()) {
-        body = EMSESP::webSchedulerService.computed_value.c_str();
-        EMSESP::webSchedulerService.computed_value.clear();
-        EMSESP::webSchedulerService.computed_value.shrink_to_fit(); // free allocated memory
-    }
-    msg.text.body(body);
-
-    // bodyText.replace("\r\n", "<br>\r\n");
-    // msg.html.body("<html><body><div style=\"color:#cc0066;\">" + bodyText + "</div></body></html>");
-    // msg.html.transferEncoding("base64");
-
-    // With embedFile function, the html message will send as attachment.
-    // if (EMBED_MESSAGE)
-    //    msg.html.embedFile(true, "msg.html", embed_message_type_attachment);
-
-    msg.timestamp = time(nullptr);
-
-    success = smtp->send(msg);
-
-    delete smtp;
-    delete r_client;
-    delete ssl_client;
-    delete basic_client;
-#endif
-    return success;
-}
-
 // return string of languages and count
 std::string System::languages_string() {
     std::string languages_string = std::to_string(NUM_LANGUAGES) + " languages (";
@@ -356,8 +237,7 @@ bool System::command_message(const char * value, const int8_t id, JsonObject out
     LOG_INFO("Message: %s", EMSESP::webSchedulerService.computed_value.c_str());  // send to log
     Mqtt::queue_publish(F_(message), EMSESP::webSchedulerService.computed_value); // send to MQTT if enabled
     output["api_data"] = EMSESP::webSchedulerService.computed_value;              // send to API
-    EMSESP::webSchedulerService.computed_value.clear();
-    EMSESP::webSchedulerService.computed_value.shrink_to_fit();
+
     return true;
 }
 
@@ -408,11 +288,11 @@ void System::get_partition_info() {
     partition_info_.clear(); // clear existing data
 
 #ifdef EMSESP_STANDALONE
-    // dummy data for standalone mode - version, size, install_date
-    partition_info_["app0"]    = {EMSESP_APP_VERSION, 0, ""};
-    partition_info_["app1"]    = {"", 0, ""};
-    partition_info_["factory"] = {"", 0, ""};
-    partition_info_["boot"]    = {"", 0, ""};
+    // dummy data for standalone mode - version, size, install_date in UTC epoch
+    partition_info_["app0"]    = {EMSESP_APP_VERSION, 0, 0};
+    partition_info_["app1"]    = {"", 0, 0};
+    partition_info_["factory"] = {"", 0, 0};
+    partition_info_["boot"]    = {"", 0, 0};
 #else
 
     auto current_partition = (const char *)esp_ota_get_running_partition()->label;
@@ -452,20 +332,19 @@ void System::get_partition_info() {
             p_info.version = EMSESP::nvs_.getString(part->label, "").c_str();
             char c[20];
             snprintf(c, sizeof(c), "d_%s", (const char *)part->label);
-            time_t d = EMSESP::nvs_.getULong(c, 0);
-            char   time_string[25];
-            strftime(time_string, sizeof(time_string), "%FT%T", localtime(&d));
-            p_info.install_date = d > 1500000000L ? time_string : "";
+            time_t d            = EMSESP::nvs_.getULong(c, 0);
+            p_info.install_date = d > 1500000000L ? d : 0; // store UTC epoch; formatted to local time at render
 
-            esp_image_metadata_t meta     = {};
-            esp_partition_pos_t  part_pos = {.offset = part->address, .size = part->size};
-            if (esp_image_verify(ESP_IMAGE_VERIFY_SILENT, &part_pos, &meta) == ESP_OK) {
-                p_info.size = meta.image_len / 1024; // actual firmware size in KB
-            } else {
-                p_info.size = 0;
+            if (!p_info.version.empty()) {
+                esp_image_metadata_t meta     = {};
+                esp_partition_pos_t  part_pos = {.offset = part->address, .size = part->size};
+                if (esp_image_verify(ESP_IMAGE_VERIFY_SILENT, &part_pos, &meta) == ESP_OK) {
+                    p_info.size = meta.image_len / 1024; // actual firmware size in KB
+                } else {
+                    p_info.size = 0;
+                }
+                partition_info_[part->label] = p_info;
             }
-
-            partition_info_[part->label] = p_info;
         }
 
         it = esp_partition_next(it); // loop to next partition
@@ -474,7 +353,7 @@ void System::get_partition_info() {
 #endif
 }
 
-// set NTP install time/date for the current partition
+// set install time/date for the current partition, in UTC
 // assumes NTP is connected and working
 void System::set_partition_install_date() {
 #ifndef EMSESP_STANDALONE
@@ -582,6 +461,7 @@ void System::system_restart(const char * partitionname) {
 
     Mqtt::disconnect(); // gracefully disconnect MQTT, needed for QOS1
     EMSuart::stop();    // stop UART so there is no interference
+
 #ifndef EMSESP_STANDALONE
     delay(1000);   // wait 1 second
     ESP.restart(); // ka-boom! - this is the only place where the ESP32 restart is called
@@ -683,6 +563,7 @@ void System::store_settings(WebSettings & settings) {
 
     locale_         = settings.locale;
     developer_mode_ = settings.developer_mode;
+
     // start services
     if (settings.modbus_enabled) {
         if (EMSESP::modbus_ == nullptr) {
@@ -724,11 +605,20 @@ void System::start() {
     appfree_ = esp_ota_get_running_partition()->size / 1024 - appused_;
     refreshHeapMem(); // refresh free heap and max alloc heap
 #if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2
+#if ESP_IDF_VERSION_MAJOR < 5
+    temp_sensor_config_t temp_sensor = TSENS_CONFIG_DEFAULT();
+    temp_sensor_get_config(&temp_sensor);
+    temp_sensor.dac_offset = TSENS_DAC_DEFAULT; // DEFAULT: range:-10℃ ~  80℃, error < 1℃.
+    temp_sensor_set_config(temp_sensor);
+    temp_sensor_start();
+    temp_sensor_read_celsius(&temperature_);
+#else
     temperature_sensor_config_t temp_sensor_config = TEMPERATURE_SENSOR_CONFIG_DEFAULT(-10, 80);
     temperature_sensor_install(&temp_sensor_config, &temperature_handle_);
     temperature_sensor_enable(temperature_handle_);
     temperature_sensor_get_celsius(temperature_handle_, &temperature_);
 #endif
+#endif
 #endif
 
     EMSESP::esp32React.getNetworkSettingsService()->read([&](NetworkSettings & networkSettings) {
@@ -949,9 +839,16 @@ void System::send_info_mqtt() {
         doc["IPv4 gateway"]    = uuid::printable_to_string(WiFi.gatewayIP());
         doc["IPv4 nameserver"] = uuid::printable_to_string(WiFi.dnsIP());
 
+#if ESP_IDF_VERSION_MAJOR < 5
+        if (WiFi.localIPv6().toString() != "0000:0000:0000:0000:0000:0000:0000:0000" && WiFi.localIPv6().toString() != "::") {
+            doc["IPv6 address"] = uuid::printable_to_string(WiFi.localIPv6());
+        }
+#else
         if (WiFi.linkLocalIPv6().toString() != "0000:0000:0000:0000:0000:0000:0000:0000" && WiFi.linkLocalIPv6().toString() != "::") {
             doc["IPv6 address"] = uuid::printable_to_string(WiFi.linkLocalIPv6());
         }
+
+#endif
     }
 #endif
     Mqtt::queue_publish_retain(F_(info), doc.as<JsonObject>()); // topic called "info" and it's Retained
@@ -1060,8 +957,13 @@ void System::network_init() {
         delay(500);
         digitalWrite(eth_power_, HIGH);
     }
+
+#if ESP_IDF_VERSION_MAJOR < 5
+    eth_present_ = ETH.begin(phy_addr, power, mdc, mdio, type, clock_mode);
+#else
     eth_present_ = ETH.begin(type, phy_addr, mdc, mdio, power, clock_mode);
 #endif
+#endif
 }
 
 // check health of system, done every 5 seconds
@@ -1072,9 +974,13 @@ void System::system_check() {
 
 #ifndef EMSESP_STANDALONE
 #if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2
+#if ESP_IDF_VERSION_MAJOR < 5
+        temp_sensor_read_celsius(&temperature_);
+#else
         temperature_sensor_get_celsius(temperature_handle_, &temperature_);
 #endif
 #endif
+#endif
 
 #ifdef EMSESP_PINGTEST
         static uint64_t ping_count = 0;
@@ -1126,7 +1032,6 @@ void System::commands_init() {
     Command::add(EMSdevice::DeviceType::SYSTEM, F_(read), System::command_read, FL_(read_cmd), CommandFlag::ADMIN_ONLY);
     Command::add(EMSdevice::DeviceType::SYSTEM, F_(send), System::command_send, FL_(send_cmd), CommandFlag::ADMIN_ONLY);
     Command::add(EMSdevice::DeviceType::SYSTEM, F_(fetch), System::command_fetch, FL_(fetch_cmd), CommandFlag::ADMIN_ONLY);
-    Command::add(EMSdevice::DeviceType::SYSTEM, F_(sendmail), System::command_sendmail, FL_(sendmail_cmd), CommandFlag::ADMIN_ONLY);
     Command::add(EMSdevice::DeviceType::SYSTEM, F_(restart), System::command_restart, FL_(restart_cmd), CommandFlag::ADMIN_ONLY);
     Command::add(EMSdevice::DeviceType::SYSTEM, F_(format), System::command_format, FL_(format_cmd), CommandFlag::ADMIN_ONLY);
     Command::add(EMSdevice::DeviceType::SYSTEM, F_(txpause), System::command_txpause, FL_(txpause_cmd), CommandFlag::ADMIN_ONLY);
@@ -1333,11 +1238,18 @@ void System::show_system(uuid::console::Shell & shell) {
         if (partition.second.version.empty()) {
             continue; // no version, empty string
         }
+        std::string installed;
+        if (partition.second.install_date > 0) {
+            char   time_string[25];
+            time_t d = partition.second.install_date;
+            strftime(time_string, sizeof(time_string), "%FT%T", localtime(&d));
+            installed = std::string(", installed on ") + time_string;
+        }
         shell.printfln("  %s: v%s (%d KB%s) %s",
                        partition.first.c_str(),
                        partition.second.version.c_str(),
                        partition.second.size,
-                       partition.second.install_date.empty() ? "" : (std::string(", installed on ") + partition.second.install_date).c_str(),
+                       installed.c_str(),
                        (strcmp(esp_ota_get_running_partition()->label, partition.first.c_str()) == 0) ? "** active **" : "");
     }
 
@@ -1368,9 +1280,16 @@ void System::show_system(uuid::console::Shell & shell) {
         shell.printfln(" IPv4 address: %s/%s", uuid::printable_to_string(WiFi.localIP()).c_str(), uuid::printable_to_string(WiFi.subnetMask()).c_str());
         shell.printfln(" IPv4 gateway: %s", uuid::printable_to_string(WiFi.gatewayIP()).c_str());
         shell.printfln(" IPv4 nameserver: %s", uuid::printable_to_string(WiFi.dnsIP()).c_str());
+#if ESP_IDF_VERSION_MAJOR < 5
+        if (WiFi.localIPv6().toString() != "0000:0000:0000:0000:0000:0000:0000:0000" && WiFi.localIPv6().toString() != "::") {
+            shell.printfln(" IPv6 address: %s", uuid::printable_to_string(WiFi.localIPv6()).c_str());
+        }
+#else
         if (WiFi.linkLocalIPv6().toString() != "0000:0000:0000:0000:0000:0000:0000:0000" && WiFi.linkLocalIPv6().toString() != "::") {
             shell.printfln(" IPv6 address: %s", uuid::printable_to_string(WiFi.linkLocalIPv6()).c_str());
         }
+#endif
+
         break;
 
     case WL_CONNECT_FAILED:
@@ -1401,9 +1320,15 @@ void System::show_system(uuid::console::Shell & shell) {
         shell.printfln(" IPv4 address: %s/%s", uuid::printable_to_string(ETH.localIP()).c_str(), uuid::printable_to_string(ETH.subnetMask()).c_str());
         shell.printfln(" IPv4 gateway: %s", uuid::printable_to_string(ETH.gatewayIP()).c_str());
         shell.printfln(" IPv4 nameserver: %s", uuid::printable_to_string(ETH.dnsIP()).c_str());
+#if ESP_IDF_VERSION_MAJOR < 5
+        if (ETH.localIPv6().toString() != "0000:0000:0000:0000:0000:0000:0000:0000" && ETH.localIPv6().toString() != "::") {
+            shell.printfln(" IPv6 address: %s", uuid::printable_to_string(ETH.localIPv6()).c_str());
+        }
+#else
         if (ETH.linkLocalIPv6().toString() != "0000:0000:0000:0000:0000:0000:0000:0000" && ETH.linkLocalIPv6().toString() != "::") {
             shell.printfln(" IPv6 address: %s", uuid::printable_to_string(ETH.linkLocalIPv6()).c_str());
         }
+#endif
     }
     shell.println();
 
@@ -1425,10 +1350,10 @@ void System::show_system(uuid::console::Shell & shell) {
     }
 
     shell.println();
+
 #endif
 }
 
-
 // see if there is a restore of an older settings file that needs to be applied
 // note there can be only one file at a time
 bool System::check_restore() {
@@ -1613,8 +1538,8 @@ bool System::check_upgrade() {
         settingsVersion = "3.5.0"; // this was the last stable version without version info
     }
 
-    version::Semver200_version settings_version(settingsVersion);
-    version::Semver200_version this_version(EMSESP_APP_VERSION);
+    version::EMSESP_Version settings_version(settingsVersion);
+    version::EMSESP_Version this_version(EMSESP_APP_VERSION);
 
     std::string settings_version_type = settings_version.prerelease().empty() ? "" : ("-" + settings_version.prerelease());
     std::string this_version_type     = this_version.prerelease().empty() ? "" : ("-" + this_version.prerelease());
@@ -1728,8 +1653,8 @@ bool System::check_upgrade() {
     return false; // no reboot required
 }
 
-#ifndef EMSESP_STANDALONE
 // map each config filename to its human-readable section key
+#ifndef EMSESP_STANDALONE
 static const std::pair<const char *, const char *> SECTION_MAP[] = {
     {NETWORK_SETTINGS_FILE, "Network"},
     {AP_SETTINGS_FILE, "AP"},
@@ -1765,18 +1690,17 @@ void System::exportSettings(const std::string & type, const char * filename, Jso
 
     File settingsFile = LittleFS.open(filename);
     if (settingsFile) {
-        JsonDocument         jsonDocument;
-        DeserializationError error = deserializeJson(jsonDocument, settingsFile);
-        if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) {
-            JsonObject node = output[section].to<JsonObject>();
-            for (JsonPair kvp : jsonDocument.as<JsonObject>()) {
-                node[kvp.key()] = kvp.value();
+        {
+            JsonDocument         jsonDocument;
+            DeserializationError error = deserializeJson(jsonDocument, settingsFile);
+            settingsFile.close(); // close early, we no longer need the file
+            if (error || !jsonDocument.is<JsonObject>()) {
+                LOG_ERROR("Failed to deserialize settings file %s", filename);
+                return;
             }
-        } else {
-            LOG_ERROR("Failed to deserialize settings file %s", filename);
+            output[section].set(jsonDocument.as<JsonObject>());
         }
         LOG_DEBUG("Exported %s settings from file %s", section, filename);
-        settingsFile.close();
     } else {
         LOG_ERROR("No settings file for %s found", filename);
     }
@@ -1789,7 +1713,7 @@ void System::exportSystemBackup(JsonObject output) {
     output["version"] = EMSESP_APP_VERSION; // add the version to the output
 
 #ifndef EMSESP_STANDALONE
-    // add date/time if NTP enabled and active
+        // add date/time if NTP enabled and active
     if ((esp_sntp_enabled()) && (EMSESP::system_.ntp_connected())) {
         time_t now = time(nullptr);
         if (now > 1500000000L) {
@@ -1828,13 +1752,15 @@ void System::exportSystemBackup(JsonObject output) {
     if (file) {
         JsonDocument         jsonDocument;
         DeserializationError error = deserializeJson(jsonDocument, file);
-        if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) {
-            JsonObject node = nodes.add<JsonObject>();
-            node["type"]    = "customSupport";
-            node["data"]    = jsonDocument.as<JsonObject>();
+        file.close(); // close early, we no longer need the file
+        if (!error && jsonDocument.is<JsonObject>()) {
+            JsonObject support_node = nodes.add<JsonObject>();
+            support_node["type"]    = "customSupport";
+            support_node["data"].set(jsonDocument.as<JsonObject>());
+            LOG_DEBUG("Exported custom support file %s", EMSESP_CUSTOMSUPPORT_FILE);
+        } else {
+            LOG_ERROR("Failed to deserialize custom support file");
         }
-        file.close();
-        LOG_DEBUG("Exported custom support file %s", EMSESP_CUSTOMSUPPORT_FILE);
     }
 
     // Backup NVS values
@@ -1843,16 +1769,27 @@ void System::exportSystemBackup(JsonObject output) {
 
     const char *   nvs_part = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_NVS, "nvs1") ? "nvs1" : "nvs"; // nvs1 is on 16MBs
     nvs_iterator_t it       = nullptr;
-    esp_err_t      err      = nvs_entry_find(nvs_part, "ems-esp", NVS_TYPE_ANY, &it);
+#if ESP_IDF_VERSION_MAJOR < 5
+    it = nvs_entry_find(nvs_part, "ems-esp", NVS_TYPE_ANY);
+    if (it == nullptr) {
+#else
+    esp_err_t err = nvs_entry_find(nvs_part, "ems-esp", NVS_TYPE_ANY, &it);
     if (err != ESP_OK) {
+#endif
         LOG_ERROR("Failed to find NVS entry for %s", nvs_part);
         return;
     }
 
     JsonArray entries = node["nvs"].to<JsonArray>();
+#if ESP_IDF_VERSION_MAJOR < 5
+    while (it != nullptr) {
+        nvs_entry_info_t info;
+        nvs_entry_info(it, &info);
+#else
     while (err == ESP_OK) {
         nvs_entry_info_t info;
         nvs_entry_info(it, &info);
+#endif
         JsonObject entry = entries.add<JsonObject>();
         entry["type"]    = info.type;
         entry["key"]     = info.key;
@@ -1887,8 +1824,14 @@ void System::exportSystemBackup(JsonObject output) {
             entry["value"] = EMSESP::nvs_.getString(info.key);
             break;
         }
+
+#if ESP_IDF_VERSION_MAJOR < 5
+        it = nvs_entry_next(it);
+    }
+#else
         err = nvs_entry_next(&it);
     }
+#endif
 
     if (it != nullptr) {
         nvs_release_iterator(it);
@@ -2690,12 +2633,12 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
         node["maxWebLogBuffer"] = settings.weblog_buffer;
 
         /*
- #if defined(EMSESP_UNITY)
-         node["webLogBuffer"] = 0;
- #else
-         node["webLogBuffer"] = EMSESP::webLogService.num_log_messages();
- #endif
- */
+#if defined(EMSESP_UNITY)
+        node["webLogBuffer"] = 0;
+#else
+        node["webLogBuffer"] = EMSESP::webLogService.num_log_messages();
+#endif
+*/
         node["modbusEnabled"]   = settings.modbus_enabled;
         node["forceHeatingOff"] = settings.boiler_heatingoff;
         node["developerMode"]   = settings.developer_mode;
@@ -3323,7 +3266,7 @@ void System::set_valid_system_gpios() {
     valid_system_gpios_ = string_range_to_vector("0-21", "2, 8, 12-17, 18-19");
 
 #elif CONFIG_IDF_TARGET_ESP32S2
-    // https://docs.espressif.com/projects/esp-idf/en/stable/esp32s2/api-reference/peripherals/gpio.html
+        // https://docs.espressif.com/projects/esp-idf/en/stable/esp32s2/api-reference/peripherals/gpio.html
     // excluded:
     // GPIO26 - GPIO32 = SPI flash and PSRAM
     // GPIO45 - GPIO46 = strapping pins
@@ -3336,7 +3279,7 @@ void System::set_valid_system_gpios() {
     valid_system_gpios_ = string_range_to_vector("0-46", "19, 20, 26-32, 45-46, 39-42, 22-25");
 
 #elif CONFIG_IDF_TARGET_ESP32S3
-    // https://docs.espressif.com/projects/esp-idf/en/stable/esp32s3/api-reference/peripherals/gpio.html
+        // https://docs.espressif.com/projects/esp-idf/en/stable/esp32s3/api-reference/peripherals/gpio.html
     // excluded:
     // GPIO3, GPIO45 - GPIO46 = strapping pins
     // GPIO26 - GPIO32 = SPI flash and PSRAM and not recommended
@@ -3355,7 +3298,7 @@ void System::set_valid_system_gpios() {
     }
 
 #elif CONFIG_IDF_TARGET_ESP32
-    // https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-reference/peripherals/gpio.html
+        // https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-reference/peripherals/gpio.html
     // excluded:
     // GPIO6 - GPIO11, GPIO16 - GPIO17 = used for SPI flash and PSRAM (dio mode only GPIO06-GPIO08, GPIO11)
     // GPIO20, GPIO24, GPIO28 - GPIO31 = don't exist
@@ -3386,10 +3329,6 @@ void System::set_valid_system_gpios() {
     } else {
         valid_system_gpios_ = string_range_to_vector("0-39", "6-11, 20, 24, 28-31");
     }
-#elif CONFIG_IDF_TARGET_ESP32C6
-    // https://docs.espressif.com/projects/esp-idf/en/v5.5.3/esp32c6/api-reference/peripherals/gpio.html
-    // 24-30 used for flash, 12-13 USB, 16-17 uart0
-    valid_system_gpios_ = string_range_to_vector("0-30", "12-13, 16-17, 24-30");
 #elif defined(EMSESP_STANDALONE)
     valid_system_gpios_ = string_range_to_vector("0-39");
 #endif

src/core/system.h

@@ -37,7 +37,11 @@
 #include <uuid/log.h>
 #include <PButton.h>
 
+#if ESP_ARDUINO_VERSION_MAJOR < 3
+#define EMSESP_RGB_WRITE neopixelWrite
+#else
 #define EMSESP_RGB_WRITE rgbLedWrite
+#endif
 
 #if CONFIG_IDF_TARGET_ESP32
 // there is no official API available on the original ESP32
@@ -45,8 +49,12 @@ extern "C" {
 uint8_t temprature_sens_read();
 }
 #elif CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2
+#if ESP_IDF_VERSION_MAJOR < 5
+#include "driver/temp_sensor.h"
+#else
 #include "driver/temperature_sensor.h"
 #endif
+#endif
 
 using uuid::console::Shell;
 
@@ -75,7 +83,7 @@ enum FUSE_VALUE : uint8_t { ALL = 0, MFG = 1, MODEL = 2, BOARD = 3, REV = 4, BAT
 struct PartitionInfo {
     std::string version;
     size_t      size;
-    std::string install_date; // optional, only available if NTP is connected
+    time_t      install_date; // UTC epoch seconds; 0 if unknown. Format with localtime() at render time so it honors the current TZ.
 };
 
 class System {
@@ -95,7 +103,6 @@ class System {
     static bool command_info(const char * value, const int8_t id, JsonObject output);
     static bool command_response(const char * value, const int8_t id, JsonObject output);
     static bool command_service(const char * cmd, const char * value);
-    static bool command_sendmail(const char * value, const int8_t id);
     static bool command_txpause(const char * value, const int8_t id);
 
     static bool        get_value_info(JsonObject root, const char * cmd);
@@ -495,7 +502,9 @@ class System {
     uint32_t appfree_;
 
 #if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2
+#if ESP_IDF_VERSION_MAJOR >= 5
     temperature_sensor_handle_t temperature_handle_ = NULL;
+#endif
 #endif
     float temperature_ = 0;
 };

src/core/telegram.h

@@ -159,11 +159,10 @@ class EMSbus {
   public:
     static uuid::log::Logger logger_;
 
-    static constexpr uint8_t EMS_MASK_UNSET       = 0xFF; // EMS bus type (budrus/junkers) hasn't been detected yet
-    static constexpr uint8_t EMS_MASK_HT3         = 0x80; // EMS bus type Junkers/HT3
-    static constexpr uint8_t EMS_MASK_BUDERUS     = 0xFF; // EMS bus type Buderus
-    static constexpr uint8_t EMS_TX_ERROR_LIMIT   = 10;   // % limit of failed Tx read/write attempts before showing a warning
-    static constexpr uint8_t EMS_POLL_MATCH_LIMIT = 3;    // consecutive poll matches needed before declaring bus connected
+    static constexpr uint8_t EMS_MASK_UNSET     = 0xFF; // EMS bus type (budrus/junkers) hasn't been detected yet
+    static constexpr uint8_t EMS_MASK_HT3       = 0x80; // EMS bus type Junkers/HT3
+    static constexpr uint8_t EMS_MASK_BUDERUS   = 0xFF; // EMS bus type Buderus
+    static constexpr uint8_t EMS_TX_ERROR_LIMIT = 10;   // % limit of failed Tx read/write attempts before showing a warning
 
     static bool is_ht3() {
         return (ems_mask_ == EMS_MASK_HT3);
@@ -211,6 +210,7 @@ class EMSbus {
         if (!last_bus_activity_) {
             bus_uptime_start_ = timestamp;
         }
+
         last_bus_activity_ = timestamp;
         bus_connected_     = true;
     }

src/core/temperaturesensor.cpp

@@ -21,12 +21,6 @@
 #include "temperaturesensor.h"
 #include "emsesp.h"
 
-#ifdef ESP32
-#define YIELD
-#else
-#define YIELD yield()
-#endif
-
 namespace emsesp {
 
 uuid::log::Logger TemperatureSensor::logger_{F_(temperaturesensor), uuid::log::Facility::DAEMON};
@@ -81,7 +75,6 @@ void TemperatureSensor::loop() {
             LOG_DEBUG("Read sensor temperature");
 #endif
             if (bus_.reset() || parasite_) {
-                YIELD;
                 bus_.skip();
                 bus_.write(CMD_CONVERT_TEMP, parasite_ ? 1 : 0);
                 state_     = State::READING;
@@ -260,19 +253,16 @@ int16_t TemperatureSensor::get_temperature_c(const uint8_t addr[]) {
         LOG_ERROR("Bus reset failed before reading scratchpad from %s", Sensor(addr).id());
         return EMS_VALUE_INT16_NOTSET;
     }
-    YIELD;
 
     uint8_t scratchpad[SCRATCHPAD_LEN] = {0};
     bus_.select(addr);
     bus_.write(CMD_READ_SCRATCHPAD);
     bus_.read_bytes(scratchpad, SCRATCHPAD_LEN);
-    YIELD;
 
     if (!bus_.reset()) {
         LOG_ERROR("Bus reset failed after reading scratchpad from %s", Sensor(addr).id());
         return EMS_VALUE_INT16_NOTSET;
     }
-    YIELD;
 
     if (bus_.crc8(scratchpad, SCRATCHPAD_LEN - 1) != scratchpad[SCRATCHPAD_LEN - 1]) {
         LOG_WARNING("Invalid scratchpad CRC: %02X%02X%02X%02X%02X%02X%02X%02X%02X from sensor %s",

src/devices/connect.cpp

@@ -39,11 +39,11 @@ Connect::Connect(uint8_t device_type, uint8_t device_id, uint8_t product_id, con
                           DeviceValueUOM::DEGREES);
     // Roomthermostats
     for (uint8_t i = 0; i < 16; i++) {
-        register_telegram_type(0x0BDD + i, "Room", false, MAKE_PF_CB(process_roomThermostat));                    // broadcasted
-        register_telegram_type(0x0B3D + i, "Roomname", false, MAKE_PF_CB(process_roomThermostatName), 100);       // fetch for active circuits
+        register_telegram_type(0x0BDD + i, "Room", false, MAKE_PF_CB(process_roomThermostat));                 // broadcasted
+        register_telegram_type(0x0B3D + i, "Roomname", false, MAKE_PF_CB(process_roomThermostatName), 100);         // fetch for active circuits
         register_telegram_type(0x0BB5 + i, "Roomsettings", false, MAKE_PF_CB(process_roomThermostatSettings), 8); // fetch for active circuits
-        register_telegram_type(0x1230 + i, "Roomparams", false, MAKE_PF_CB(process_roomThermostatParam));         // fetch for active circuits
-        register_telegram_type(0x1244 + i, "Roomdata", false, MAKE_PF_CB(process_roomThermostatData));            // broadcasted
+        register_telegram_type(0x1230 + i, "Roomparams", false, MAKE_PF_CB(process_roomThermostatParam));      // fetch for active circuits
+        register_telegram_type(0x1244 + i, "Roomdata", false, MAKE_PF_CB(process_roomThermostatData));         // broadcasted
     }
     register_telegram_type(0xDB65, "Roomschedule", true, MAKE_PF_CB(process_roomSchedule));
     // 0x2040, broadcast 36 bytes:

src/devices/thermostat.cpp

@@ -166,14 +166,14 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
         set2_typeids              = {0x0421, 0x0422, 0x0423, 0x0424};
         summer_typeids            = {0x02AF, 0x02B0, 0x02B1, 0x02B2, 0x02B3, 0x02B4, 0x02B5, 0x02B6};
         curve_typeids             = {0x029B, 0x029C, 0x029D, 0x029E, 0x029F, 0x02A0, 0x02A1, 0x02A2};
-        summer2_typeids           = {0x0471, 0x0472, 0x0473, 0x0474, 0x0475, 0x0476, 0x0477, 0x0478};
+        summer2_typeids           = {0x0470, 0x0471, 0x0472, 0x0473, 0x0474, 0x0475, 0x0476, 0x0477, 0x0478};
         hp_typeids                = {0x0467, 0x0468, 0x0469, 0x046A};
         hpmode_typeids            = {0x0291, 0x0292, 0x0293, 0x0294};
         const size_t monitor_size = monitor_typeids.size();
         for (uint8_t i = 0; i < monitor_size; i++) {
             register_telegram_type(monitor_typeids[i], "RC300Monitor", false, MAKE_PF_CB(process_RC300Monitor), 33);
             register_telegram_type(set_typeids[i], "RC300Set", false, MAKE_PF_CB(process_RC300Set), 29);
-            register_telegram_type(summer_typeids[i], "RC300Summer", false, MAKE_PF_CB(process_RC300Summer), 13);
+            register_telegram_type(summer_typeids[i], "RC300Summer", false, MAKE_PF_CB(process_RC300Summer), 14);
             register_telegram_type(curve_typeids[i], "RC300Curves", false, MAKE_PF_CB(process_RC300Curve), 9);
             register_telegram_type(summer2_typeids[i], "RC300Summer2", false, MAKE_PF_CB(process_RC300Summer2), 8);
         }
@@ -202,7 +202,7 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
         if (model == EMSdevice::EMS_DEVICE_FLAG_RC100) {
             register_telegram_type(0x43F, "CRHolidays", true, MAKE_PF_CB(process_RC300Holiday), 6);
         } else {
-            register_telegram_type(0x269, "RC300Holiday", true, MAKE_PF_CB(process_RC300Holiday), 6);
+            register_telegram_type(0x269, "RC300Holiday", true, MAKE_PF_CB(process_RC300Holiday), 18);
         }
         register_telegram_type(0x16E, "Absent", true, MAKE_PF_CB(process_Absent), 1);
         register_telegram_type(0xBF, "ErrorMessage", false, MAKE_PF_CB(process_ErrorMessageBF));

src/emsesp_version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.9.0-dev.0"
+#define EMSESP_APP_VERSION "3.8.2-dev.19"

src/uart/emsuart_esp32.cpp

@@ -66,23 +66,18 @@ void EMSuart::uart_event_task(void * pvParameters) {
 // initialize UART driver
 void EMSuart::start(const uint8_t tx_mode, const uint8_t rx_gpio, const uint8_t tx_gpio) {
     if (tx_mode_ == EMS_TXMODE_INIT) {
-#if CONFIG_IDF_TARGET_ESP32C6
-        uart_config_t uart_config = {.baud_rate           = EMSUART_BAUD,
-                                     .data_bits           = UART_DATA_8_BITS,
-                                     .parity              = UART_PARITY_DISABLE,
-                                     .stop_bits           = UART_STOP_BITS_1,
-                                     .flow_ctrl           = UART_HW_FLOWCTRL_DISABLE,
-                                     .rx_flow_ctrl_thresh = 0};
-#else
         uart_config_t uart_config = {.baud_rate           = EMSUART_BAUD,
                                      .data_bits           = UART_DATA_8_BITS,
                                      .parity              = UART_PARITY_DISABLE,
                                      .stop_bits           = UART_STOP_BITS_1,
                                      .flow_ctrl           = UART_HW_FLOWCTRL_DISABLE,
                                      .rx_flow_ctrl_thresh = 0,
-                                     .source_clk          = UART_SCLK_APB,
-                                     .flags               = {0}};
+                                     .source_clk          = UART_SCLK_APB
+#if ESP_ARDUINO_VERSION_MAJOR >= 3
+                                     ,
+                                     .flags = {0}
 #endif
+        };
 #if defined(EMSUART_RX_INVERT)
         inverse_mask |= UART_SIGNAL_RXD_INV;
 #endif

src/web/WebCustomEntityService.cpp

@@ -686,7 +686,7 @@ void WebCustomEntityService::fetch() {
             uint8_t stop       = (entity.offset + len[entity.value_type]) % fetchblock;
             bool    is_fetched = start < fetchblock && stop < fetchblock; // make sure the complete value is a a fetched block
             for (const auto & emsdevice : EMSESP::emsdevices) {
-                if (emsdevice->is_device_id(entity.device_id) && emsdevice->is_fetch(entity.type_id)
+                if (emsdevice->is_device_id(entity.device_id) && emsdevice->is_fetch(entity.type_id, entity.offset + len[entity.value_type])
                     && (is_fetched || entity.value_type == DeviceValueType::STRING)) {
                     needFetch = false;
                     break;