Merge pull request #2990 from MichaelDvP/dev

dev.11, fix #2988, asyncWebserver 3.10.2

CHANGELOG_LATEST.md

@@ -12,7 +12,6 @@ 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
 
 ## Fixed
 
@@ -28,5 +27,3 @@ 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

Makefile

@@ -65,7 +65,6 @@ CXX_STANDARD := -std=gnu++17
 #----------------------------------------------------------------------
 DEFINES += -DARDUINOJSON_ENABLE -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSON_USE_DOUBLE=0
 DEFINES += -DEMSESP_STANDALONE -DEMSESP_TEST -DEMSESP_DEBUG -DEMC_RX_BUFFER_SIZE=1500
-DEFINES += -DNO_TLS_SUPPORT
 DEFINES += $(ARGS)
 
 DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32S3\"
@@ -80,10 +79,6 @@ SYMBOLS    := $(CURDIR)/$(BUILD)/$(TARGET).out
 CSOURCES   := $(shell find $(SOURCES) -name "*.c" 2>/dev/null)
 CXXSOURCES := $(shell find $(SOURCES) -name "*.cpp" 2>/dev/null)
 
-# Exclude files not needed for standalone build, if they exist
-CSOURCES   := $(filter-out src/core/ModuleLibrary.c,$(CSOURCES))
-CXXSOURCES := $(filter-out src/core/ModuleLibrary.cpp,$(CXXSOURCES))
-
 OBJS       := $(patsubst %,$(BUILD)/%.o,$(basename $(CSOURCES)) $(basename $(CXXSOURCES)))
 DEPS       := $(patsubst %,$(BUILD)/%.d,$(basename $(CSOURCES)) $(basename $(CXXSOURCES)))
 

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",

cspell.json

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

interface/eslint.config.js

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

interface/package.json

@@ -30,7 +30,7 @@
     "@mui/material": "^7.3.9",
     "@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",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@babel/core": "^7.29.0",
     "@eslint/js": "^10.0.1",
-    "@preact/compat": "^18.3.1",
+    "@preact/compat": "^18.3.2",
     "@preact/preset-vite": "^2.10.4",
     "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "@types/node": "^25.5.0",
@@ -63,8 +63,9 @@
     "rollup-plugin-visualizer": "^7.0.1",
     "terser": "^5.46.1",
     "typescript-eslint": "^8.57.1",
-    "vite": "^8.0.0",
+    "vite": "^7.3.1",
-    "vite-plugin-imagemin": "^0.6.1"
+    "vite-plugin-imagemin": "^0.6.1",
+    "vite-tsconfig-paths": "^6.1.1"
   },
-  "packageManager": "pnpm@10.32.1+sha512.a706938f0e89ac1456b6563eab4edf1d1faf3368d1191fc5c59790e96dc918e4456ab2e67d613de1043d2e8c81f87303e6b40d4ffeca9df15ef1ad567348f2be"
+  "packageManager": "pnpm@10.32.1"
 }

interface/pnpm-lock.yaml

@@ -30,7 +30,7 @@ importers:
         specifier: 4.1.15
         version: 4.1.15(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       alova:
-        specifier: ^3.5.1
+        specifier: 3.5.1
         version: 3.5.1
       async-validator:
         specifier: ^4.2.5
@@ -83,7 +83,7 @@ importers:
         version: 10.0.1(eslint@10.0.3)
       '@preact/preset-vite':
         specifier: ^2.10.4
-        version: 2.10.4(@babel/core@7.29.0)(preact@10.29.0)(rollup@4.59.0)(vite@8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1))
+        version: 2.10.4(@babel/core@7.29.0)(preact@10.29.0)(rollup@4.59.0)(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1))
       '@trivago/prettier-plugin-sort-imports':
         specifier: ^6.0.2
         version: 6.0.2(prettier@3.8.1)
@@ -121,11 +121,14 @@ importers:
         specifier: ^8.57.1
         version: 8.57.1(eslint@10.0.3)(typescript@5.9.3)
       vite:
-        specifier: ^8.0.0
+        specifier: ^7.3.1
-        version: 8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1)
+        version: 7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1)
       vite-plugin-imagemin:
         specifier: ^0.6.1
-        version: 0.6.1(vite@8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1))
+        version: 0.6.1(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1))
+      vite-tsconfig-paths:
+        specifier: ^6.1.1
+        version: 6.1.1(typescript@5.9.3)(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1))
 
 packages:
 
@@ -643,10 +646,6 @@ packages:
     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
     engines: {node: '>= 8'}
 
-  '@oxc-project/runtime@0.115.0':
-    resolution: {integrity: sha512-Rg8Wlt5dCbXhQnsXPrkOjL1DTSvXLgb2R/KYfnf1/K+R0k6UMLEmbQXPM+kwrWqSmWA2t0B1EtHy2/3zikQpvQ==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-
   '@oxc-project/types@0.115.0':
     resolution: {integrity: sha512-4n91DKnebUS4yjUHl2g3/b2T+IUdCfmoZGhmwsovZCDaJSs+QkVAM+0AqqTxHSsHfeiMuueT75cZaZcT/m0pSw==}
 
@@ -1980,6 +1979,9 @@ packages:
     resolution: {integrity: sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==}
     engines: {node: '>=8'}
 
+  globrex@0.1.2:
+    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
+
   gopd@1.2.0:
     resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
     engines: {node: '>= 0.4'}
@@ -3167,6 +3169,16 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4'
 
+  tsconfck@3.1.6:
+    resolution: {integrity: sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==}
+    engines: {node: ^18 || >=20}
+    hasBin: true
+    peerDependencies:
+      typescript: ^5.0.0
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
@@ -3255,16 +3267,20 @@ packages:
     peerDependencies:
       vite: 5.x || 6.x || 7.x || 8.x
 
-  vite@8.0.0:
+  vite-tsconfig-paths@6.1.1:
-    resolution: {integrity: sha512-fPGaRNj9Zytaf8LEiBhY7Z6ijnFKdzU/+mL8EFBaKr7Vw1/FWcTBAMW0wLPJAGMPX38ZPVCVgLceWiEqeoqL2Q==}
+    resolution: {integrity: sha512-2cihq7zliibCCZ8P9cKJrQBkfgdvcFkOOc3Y02o3GWUDLgqjWsZudaoiuOwO/gzTzy17cS5F7ZPo4bsnS4DGkg==}
+    peerDependencies:
+      vite: '*'
+
+  vite@7.3.1:
+    resolution: {integrity: sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
       '@types/node': ^20.19.0 || >=22.12.0
-      '@vitejs/devtools': ^0.0.0-alpha.31
-      esbuild: ^0.27.0
       jiti: '>=1.21.0'
       less: ^4.0.0
+      lightningcss: ^1.21.0
       sass: ^1.70.0
       sass-embedded: ^1.70.0
       stylus: '>=0.54.8'
@@ -3275,14 +3291,12 @@ packages:
     peerDependenciesMeta:
       '@types/node':
         optional: true
-      '@vitejs/devtools':
-        optional: true
-      esbuild:
-        optional: true
       jiti:
         optional: true
       less:
         optional: true
+      lightningcss:
+        optional: true
       sass:
         optional: true
       sass-embedded:
@@ -3871,9 +3885,8 @@ snapshots:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.20.1
 
-  '@oxc-project/runtime@0.115.0': {}
+  '@oxc-project/types@0.115.0':
-
+    optional: true
-  '@oxc-project/types@0.115.0': {}
 
   '@paralleldrive/cuid2@2.3.1':
     dependencies:
@@ -3885,19 +3898,19 @@ snapshots:
     dependencies:
       preact: 10.29.0
 
-  '@preact/preset-vite@2.10.4(@babel/core@7.29.0)(preact@10.29.0)(rollup@4.59.0)(vite@8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1))':
+  '@preact/preset-vite@2.10.4(@babel/core@7.29.0)(preact@10.29.0)(rollup@4.59.0)(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1))':
     dependencies:
       '@babel/core': 7.29.0
       '@babel/plugin-transform-react-jsx': 7.28.6(@babel/core@7.29.0)
       '@babel/plugin-transform-react-jsx-development': 7.27.1(@babel/core@7.29.0)
-      '@prefresh/vite': 2.4.12(preact@10.29.0)(vite@8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1))
+      '@prefresh/vite': 2.4.12(preact@10.29.0)(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1))
       '@rollup/pluginutils': 5.3.0(rollup@4.59.0)
       babel-plugin-transform-hook-names: 1.0.2(@babel/core@7.29.0)
       debug: 4.4.3
       magic-string: 0.30.21
       picocolors: 1.1.1
-      vite: 8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1)
+      vite: 7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1)
-      vite-prerender-plugin: 0.5.13(vite@8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1))
+      vite-prerender-plugin: 0.5.13(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1))
       zimmerframe: 1.1.4
     transitivePeerDependencies:
       - preact
@@ -3912,7 +3925,7 @@ snapshots:
 
   '@prefresh/utils@1.2.1': {}
 
-  '@prefresh/vite@2.4.12(preact@10.29.0)(vite@8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1))':
+  '@prefresh/vite@2.4.12(preact@10.29.0)(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1))':
     dependencies:
       '@babel/core': 7.29.0
       '@prefresh/babel-plugin': 0.5.3
@@ -3920,7 +3933,7 @@ snapshots:
       '@prefresh/utils': 1.2.1
       '@rollup/pluginutils': 4.2.1
       preact: 10.29.0
-      vite: 8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1)
+      vite: 7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -3971,7 +3984,8 @@ snapshots:
   '@rolldown/binding-win32-x64-msvc@1.0.0-rc.9':
     optional: true
 
-  '@rolldown/pluginutils@1.0.0-rc.9': {}
+  '@rolldown/pluginutils@1.0.0-rc.9':
+    optional: true
 
   '@rollup/pluginutils@4.2.1':
     dependencies:
@@ -4666,7 +4680,8 @@ snapshots:
 
   define-lazy-prop@3.0.0: {}
 
-  detect-libc@2.1.2: {}
+  detect-libc@2.1.2:
+    optional: true
 
   dezalgo@1.0.4:
     dependencies:
@@ -4891,7 +4906,6 @@ snapshots:
       '@esbuild/win32-arm64': 0.27.4
       '@esbuild/win32-ia32': 0.27.4
       '@esbuild/win32-x64': 0.27.4
-    optional: true
 
   escalade@3.2.0: {}
 
@@ -5236,6 +5250,8 @@ snapshots:
       merge2: 1.4.1
       slash: 3.0.0
 
+  globrex@0.1.2: {}
+
   gopd@1.2.0: {}
 
   got@7.1.0:
@@ -5586,6 +5602,7 @@ snapshots:
       lightningcss-linux-x64-musl: 1.32.0
       lightningcss-win32-arm64-msvc: 1.32.0
       lightningcss-win32-x64-msvc: 1.32.0
+    optional: true
 
   lines-and-columns@1.2.4: {}
 
@@ -6078,6 +6095,7 @@ snapshots:
       '@rolldown/binding-wasm32-wasi': 1.0.0-rc.9
       '@rolldown/binding-win32-arm64-msvc': 1.0.0-rc.9
       '@rolldown/binding-win32-x64-msvc': 1.0.0-rc.9
+    optional: true
 
   rollup-plugin-visualizer@7.0.1(rolldown@1.0.0-rc.9)(rollup@4.59.0):
     dependencies:
@@ -6119,7 +6137,6 @@ snapshots:
       '@rollup/rollup-win32-x64-gnu': 4.59.0
       '@rollup/rollup-win32-x64-msvc': 4.59.0
       fsevents: 2.3.3
-    optional: true
 
   run-applescript@7.1.0: {}
 
@@ -6368,6 +6385,10 @@ snapshots:
     dependencies:
       typescript: 5.9.3
 
+  tsconfck@3.1.6(typescript@5.9.3):
+    optionalDependencies:
+      typescript: 5.9.3
+
   tslib@2.8.1: {}
 
   tunnel-agent@0.6.0:
@@ -6441,7 +6462,7 @@ snapshots:
       spdx-correct: 3.2.0
       spdx-expression-parse: 3.0.1
 
-  vite-plugin-imagemin@0.6.1(vite@8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1)):
+  vite-plugin-imagemin@0.6.1(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1)):
     dependencies:
       '@types/imagemin': 7.0.1
       '@types/imagemin-gifsicle': 7.0.4
@@ -6466,11 +6487,11 @@ snapshots:
       imagemin-webp: 6.1.0
       jpegtran-bin: 6.0.1
       pathe: 0.2.0
-      vite: 8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1)
+      vite: 7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1)
     transitivePeerDependencies:
       - supports-color
 
-  vite-prerender-plugin@0.5.13(vite@8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1)):
+  vite-prerender-plugin@0.5.13(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1)):
     dependencies:
       kolorist: 1.8.0
       magic-string: 0.30.21
@@ -6478,20 +6499,30 @@ snapshots:
       simple-code-frame: 1.3.0
       source-map: 0.7.6
       stack-trace: 1.0.0-pre2
-      vite: 8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1)
+      vite: 7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1)
 
-  vite@8.0.0(@types/node@25.5.0)(esbuild@0.27.4)(terser@5.46.1):
+  vite-tsconfig-paths@6.1.1(typescript@5.9.3)(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1)):
     dependencies:
-      '@oxc-project/runtime': 0.115.0
+      debug: 4.4.3
-      lightningcss: 1.32.0
+      globrex: 0.1.2
+      tsconfck: 3.1.6(typescript@5.9.3)
+      vite: 7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1)
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
+  vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(terser@5.46.1):
+    dependencies:
+      esbuild: 0.27.4
+      fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
       postcss: 8.5.8
-      rolldown: 1.0.0-rc.9
+      rollup: 4.59.0
       tinyglobby: 0.2.15
     optionalDependencies:
       '@types/node': 25.5.0
-      esbuild: 0.27.4
       fsevents: 2.3.3
+      lightningcss: 1.32.0
       terser: 5.46.1
 
   which-typed-array@1.1.20:

interface/src/app/main/Dashboard.tsx

@@ -263,17 +263,7 @@ const Dashboard = memo(() => {
     return (
       <>
         {!data.connected && (
-          <MessageBox level="error" message={LL.EMS_BUS_WARNING() + '.'}>
+          <MessageBox level="error" message={LL.EMS_BUS_WARNING()} />
-            &nbsp;(
-            <Link
-              target="_blank"
-              to="https://docs.emsesp.org/Troubleshooting#ems-bus-is-not-connecting"
-              style={{ color: 'white' }}
-            >
-              {LL.ONLINE_HELP()}
-            </Link>
-            )
-          </MessageBox>
         )}
 
         {data.connected && data.nodes.length > 0 && !hasFavEntities && (

interface/src/app/main/Devices.tsx

@@ -8,7 +8,7 @@ import {
   useState
 } from 'react';
 import { IconContext } from 'react-icons';
-import { Link, useNavigate } from 'react-router';
+import { useNavigate } from 'react-router';
 import { toast } from 'react-toastify';
 
 import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined';
@@ -534,17 +534,7 @@ const Devices = memo(() => {
   const renderCoreData = () => (
     <>
       {!coreData.connected ? (
-        <MessageBox level="error" message={LL.EMS_BUS_WARNING() + '.'}>
+        <MessageBox level="error" message={LL.EMS_BUS_WARNING()} />
-          &nbsp;(
-          <Link
-            target="_blank"
-            to="https://docs.emsesp.org/Troubleshooting#ems-bus-is-not-connecting"
-            style={{ color: 'white' }}
-          >
-            {LL.ONLINE_HELP()}
-          </Link>
-          )
-        </MessageBox>
       ) : (
         <Box justifyContent="center" flexDirection="column">
           <IconContext.Provider

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/ApplicationSettings.tsx

@@ -28,7 +28,6 @@ import {
   FormLoader,
   MessageBox,
   SectionContent,
-  ValidatedPasswordField,
   ValidatedTextField,
   useLayoutTitle
 } from 'components';
@@ -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/status/SystemMonitor.tsx

@@ -60,16 +60,18 @@ const SystemMonitor = () => {
   const { statusMessage, isUploading, progressValue } = useMemo(() => {
     const status = data?.status;
 
-    const message =
+    let message = '';
-      status && status >= SystemStatusCodes.SYSTEM_STATUS_UPLOADING
+    if (status && status >= SystemStatusCodes.SYSTEM_STATUS_UPLOADING) {
-        ? LL.WAIT_FIRMWARE()
+      message = LL.WAIT_FIRMWARE();
-        : status === SystemStatusCodes.SYSTEM_STATUS_PENDING_RESTART
+    } else if (status === SystemStatusCodes.SYSTEM_STATUS_PENDING_RESTART) {
-          ? LL.APPLICATION_RESTARTING()
+      message = LL.APPLICATION_RESTARTING();
-          : status === SystemStatusCodes.SYSTEM_STATUS_NORMAL
+    } else if (status === SystemStatusCodes.SYSTEM_STATUS_NORMAL) {
-            ? LL.RESTARTING_PRE()
+      message = LL.RESTARTING_PRE();
-            : status === SystemStatusCodes.SYSTEM_STATUS_ERROR_UPLOAD
+    } else if (status === SystemStatusCodes.SYSTEM_STATUS_ERROR_UPLOAD) {
-              ? 'Upload Failed'
+      message = 'Upload Failed';
-              : LL.RESTARTING_POST();
+    } else {
+      message = LL.RESTARTING_POST();
+    }
 
     const uploading =
       status !== undefined && status >= SystemStatusCodes.SYSTEM_STATUS_UPLOADING;

interface/src/app/status/Version.tsx

@@ -274,6 +274,7 @@ const InstallDialog = memo(
     fetchDevVersion,
     latestVersion,
     latestDevVersion,
+    downloadOnly,
     platform,
     LL,
     onClose,
@@ -283,6 +284,7 @@ const InstallDialog = memo(
     fetchDevVersion: boolean;
     latestVersion?: VersionInfo;
     latestDevVersion?: VersionInfo;
+    downloadOnly: boolean;
     platform: string;
     LL: TranslationFunctions;
     onClose: () => void;
@@ -307,7 +309,7 @@ const InstallDialog = memo(
         <DialogContent dividers>
           <Typography mb={2}>
             {LL.INSTALL_VERSION(
-              LL.INSTALL(),
+              downloadOnly ? LL.DOWNLOAD(1) : LL.INSTALL(),
               fetchDevVersion ? latestDevVersion?.name : latestVersion?.name
             )}
           </Typography>
@@ -331,6 +333,7 @@ const InstallDialog = memo(
               {LL.DOWNLOAD(0)}
             </Link>
           </Button>
+          {!downloadOnly && (
             <Button
               startIcon={<WarningIcon color="warning" />}
               variant="outlined"
@@ -339,6 +342,7 @@ const InstallDialog = memo(
             >
               {LL.INSTALL()}
             </Button>
+          )}
         </DialogActions>
       </Dialog>
     );
@@ -419,6 +423,7 @@ const Version = () => {
   const [stableUpgradeAvailable, setStableUpgradeAvailable] =
     useState<boolean>(false);
   const [internetLive, setInternetLive] = useState<boolean>(false);
+  const [downloadOnly, setDownloadOnly] = useState<boolean>(false);
   const [showVersionInfo, setShowVersionInfo] = useState<number>(0); // 1 = stable, 2 = dev, 3 = partition
   const [firmwareSize, setFirmwareSize] = useState<number>(0);
 
@@ -444,6 +449,9 @@ const Version = () => {
     error
   } = useRequest(SystemApi.readSystemStatus).onSuccess((event) => {
     const systemData = event.data as VersionData;
+    if (systemData.arduino_version.startsWith('Tasmota')) {
+      setDownloadOnly(true);
+    }
     setUsingDevVersion(systemData.emsesp_version.includes('dev'));
   });
 
@@ -807,6 +815,7 @@ const Version = () => {
                 fetchDevVersion={fetchDevVersion}
                 latestVersion={latestVersion}
                 latestDevVersion={latestDevVersion}
+                downloadOnly={downloadOnly}
                 platform={platform}
                 LL={LL}
                 onClose={closeInstallDialog}
@@ -842,6 +851,7 @@ const Version = () => {
     locale,
     openInstallDialog,
     fetchDevVersion,
+    downloadOnly,
     me.admin,
     showButtons,
     handleVersionInfoClose,

interface/src/i18n/cz/index.ts

@@ -357,8 +357,7 @@ const cz: Translation = {
   FIRMWARE_VERSION_INFO: 'Informace o verzi firmwaru',
   NO_DATA: 'Žádná data',
   USER_PROFILE: 'Uživatelský profil',
-  STORED_VERSIONS: 'Uložené verze',
+  STORED_VERSIONS: 'Uložené verze'
-  ONLINE_HELP: 'online nápověda'
 };
 
 export default cz;

interface/src/i18n/de/index.ts

@@ -357,8 +357,7 @@ const de: Translation = {
   FIRMWARE_VERSION_INFO: 'Firmware-Versionsinformation',
   NO_DATA: 'Keine Daten',
   USER_PROFILE: 'Benutzerprofil',
-  STORED_VERSIONS: 'Gespeicherte Versionen',
+  STORED_VERSIONS: 'Gespeicherte Versionen'
-  ONLINE_HELP: 'Online-Hilfe'
 };
 
 export default de;

interface/src/i18n/en/index.ts

@@ -357,8 +357,7 @@ const en: Translation = {
   FIRMWARE_VERSION_INFO: 'Firmware Version Information',
   NO_DATA: 'No data',
   USER_PROFILE: 'User Profile',
-  STORED_VERSIONS: 'Stored Versions',
+  STORED_VERSIONS: 'Stored Versions'
-  ONLINE_HELP: 'online help'
 };
 
 export default en;

interface/src/i18n/fr/index.ts

@@ -357,8 +357,7 @@ const fr: Translation = {
   FIRMWARE_VERSION_INFO: 'Informations sur la version du firmware',
   NO_DATA: 'Aucune donnée',
   USER_PROFILE: 'Profil utilisateur',
-  STORED_VERSIONS: 'Versions stockées',
+  STORED_VERSIONS: 'Versions stockées'
-  ONLINE_HELP: 'aide en ligne'
 };
 
 export default fr;

interface/src/i18n/it/index.ts

@@ -357,8 +357,7 @@ const it: Translation = {
   FIRMWARE_VERSION_INFO: 'Informazioni sulla versione del firmware',
   NO_DATA: 'Nessun dato',
   USER_PROFILE: 'Profilo utente',
-  STORED_VERSIONS: 'Versioni memorizzate',
+  STORED_VERSIONS: 'Versioni memorizzate'
-  ONLINE_HELP: 'aiuto online'
 };
 
 export default it;

interface/src/i18n/nl/index.ts

@@ -357,8 +357,7 @@ const nl: Translation = {
   FIRMWARE_VERSION_INFO: 'Informatie over firmwareversie',
   NO_DATA: 'Geen data',
   USER_PROFILE: 'Gebruikersprofiel',
-  STORED_VERSIONS: 'Opgeslagen versies',
+  STORED_VERSIONS: 'Opgeslagen versies'
-  ONLINE_HELP: 'online help'
 };
 
 export default nl;

interface/src/i18n/no/index.ts

@@ -357,8 +357,7 @@ const no: Translation = {
   FIRMWARE_VERSION_INFO: 'Informasjon om firmwareversjon',
   NO_DATA: 'Ingen data',
   USER_PROFILE: 'Brukerprofil',
-  STORED_VERSIONS: 'Lagret versjoner',
+  STORED_VERSIONS: 'Lagret versjoner'
-  ONLINE_HELP: 'online hjelp'
 };
 
 export default no;

interface/src/i18n/pl/index.ts

@@ -357,8 +357,7 @@ const pl: BaseTranslation = {
   FIRMWARE_VERSION_INFO: 'Informacje o wersji firmware',
   NO_DATA: 'Brak danych',
   USER_PROFILE: 'Profil użytkownika',
-  STORED_VERSIONS: 'Zapisane wersje',
+  STORED_VERSIONS: 'Zapisane wersje'
-  ONLINE_HELP: 'pomoc online'
 };
 
 export default pl;

interface/src/i18n/sk/index.ts

@@ -357,8 +357,7 @@ const sk: Translation = {
   FIRMWARE_VERSION_INFO: 'Informácie o verzii firmware',
   NO_DATA: 'Žiadne dáta',
   USER_PROFILE: 'Profil používateľa',
-  STORED_VERSIONS: 'Uložené verzie',
+  STORED_VERSIONS: 'Uložené verzie'
-  ONLINE_HELP: 'online pomoc'
 };
 
 export default sk;

interface/src/i18n/sv/index.ts

@@ -357,8 +357,7 @@ const sv: Translation = {
   FIRMWARE_VERSION_INFO: 'Information om firmwareversion',
   NO_DATA: 'Ingen data',
   USER_PROFILE: 'Användarprofil',
-  STORED_VERSIONS: 'Lagrad versioner',
+  STORED_VERSIONS: 'Lagrad versioner'
-  ONLINE_HELP: 'online hjälp'
 };
 
 export default sv;

interface/src/i18n/tr/index.ts

@@ -357,8 +357,7 @@ const tr: Translation = {
   FIRMWARE_VERSION_INFO: 'Firmware Sürüm Bilgisi',
   NO_DATA: 'Hiçbir veri yok',
   USER_PROFILE: 'Kullanıcı Profili',
-  STORED_VERSIONS: 'Kaydedilmiş Sürümler',
+  STORED_VERSIONS: 'Kaydedilmiş Sürümler'
-  ONLINE_HELP: 'online yardım'
 };
 
 export default tr;

interface/src/utils/file.ts

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

interface/vite.config.ts

@@ -2,8 +2,9 @@ import preact from '@preact/preset-vite';
 import fs from 'fs';
 import path from 'path';
 import { visualizer } from 'rollup-plugin-visualizer';
-import { Plugin, PluginOption, defineConfig } from 'vite';
+import { Plugin, defineConfig } from 'vite';
 import viteImagemin from 'vite-plugin-imagemin';
+import viteTsconfigPaths from 'vite-tsconfig-paths';
 import zlib from 'zlib';
 
 // @ts-expect-error - mock server doesn't have type declarations
@@ -98,31 +99,16 @@ const createPreactPlugin = (devToolsEnabled: boolean) =>
     prefreshEnabled: false
   });
 
-// Patch preact/compat to export stub React 19 APIs (use, useOptimistic) so that
-// react-router v7 doesn't trigger IMPORT_IS_UNDEFINED warnings from Rolldown.
-const preactCompatPatchPlugin = (): Plugin => ({
-  name: 'preact-compat-react19-patch',
-  transform(code, id) {
-    if (id.includes('preact') && id.includes('compat.module.js')) {
-      return {
-        code:
-          code +
-          '\nexport var use = undefined;\nexport var useOptimistic = undefined;\n',
-        map: null
-      };
-    }
-    return undefined;
-  }
-});
-
 // Common base plugins
 const createBasePlugins = (
   devToolsEnabled: boolean,
   includeBundleReporter = true
-): PluginOption[] => {
+) => {
-  const plugins: PluginOption[] = [
+  const plugins = [
     createPreactPlugin(devToolsEnabled),
-    preactCompatPatchPlugin()
+    viteTsconfigPaths({
+      projects: ['./tsconfig.json']
+    })
   ];
   if (includeBundleReporter) {
     plugins.push(bundleSizeReporter());
@@ -248,8 +234,7 @@ export default defineConfig(
         plugins: [...createBasePlugins(true, true), mockServer()],
         resolve: {
           alias: RESOLVE_ALIASES,
-          extensions: RESOLVE_EXTENSIONS,
+          extensions: RESOLVE_EXTENSIONS
-          tsconfigPaths: true
         },
         server: {
           open: true,
@@ -278,8 +263,7 @@ export default defineConfig(
         plugins: createBasePlugins(false, true),
         resolve: {
           alias: RESOLVE_ALIASES,
-          extensions: RESOLVE_EXTENSIONS,
+          extensions: RESOLVE_EXTENSIONS
-          tsconfigPaths: true
         },
         build: {
           ...createBaseBuildConfig(),
@@ -313,8 +297,7 @@ export default defineConfig(
       ],
       resolve: {
         alias: RESOLVE_ALIASES,
-        extensions: RESOLVE_EXTENSIONS,
+        extensions: RESOLVE_EXTENSIONS
-        tsconfigPaths: true
       },
       build: {
         ...createBaseBuildConfig(),
@@ -323,7 +306,8 @@ export default defineConfig(
         rollupOptions: {
           treeshake: {
             moduleSideEffects: false,
-            propertyReadSideEffects: false as const,
+            propertyReadSideEffects: false,
+            tryCatchDeoptimization: false,
             unknownGlobalSideEffects: false
           },
           output: {

lib/OneWire/OneWire.h

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

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

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

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

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

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

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

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

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

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

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

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
@@ -77,3 +73,7 @@ the LICENSE file.
     #define EMC_SIZE_POOL_ELEMENTS 128
   #endif
 #endif
+
+#ifndef  TASMOTA_SDK
+#define EMC_CLIENT_SECURE
+#endif

lib/espMqttClient/src/MqttClient.cpp

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

lib/espMqttClient/src/MqttClient.h

@@ -69,16 +69,6 @@ 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);
@@ -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/ClientSecureSync.cpp

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

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,9 +31,12 @@ class ClientSecureSync : public Transport {
     void   stop() override;
     bool   connected() override;
     bool   disconnected() override;
-
+    // added for EMS-ESP
-    WiFiClient    basic_client;
+#if defined(EMC_CLIENT_SECURE)
-    ESP_SSLClient client;
+    WiFiClientSecure client;
+#else
+    WiFiClient client;
+#endif
 };
 
 } // namespace espMqttClientInternals

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,35 +78,36 @@ 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;
 }
@@ -75,4 +120,9 @@ espMqttClient::espMqttClient()
     , _client() {
     _transport = &_client;
 }
+#elif defined(_WIN32) || defined(__APPLE__)
+// Windows
+espMqttClient::espMqttClient()
+    : MqttClientSetup(espMqttClientTypes::UseInternalTask::NO) {
+}
 #endif

lib/espMqttClient/src/espMqttClient.h

@@ -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
+#elif defined(__linux__)
-
-#if 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_standalone/Arduino.cpp

@@ -145,7 +145,6 @@ double ledcSetup(uint8_t chan, double freq, uint8_t bit_num) {
     return 0;
 };
 void ledcAttachPin(uint8_t pin, uint8_t chan) {};
-void ledcAttach(uint8_t pin, uint8_t chan, uint8_t bit_num) {};
 void ledcWrite(uint8_t chan, uint32_t duty) {};
 void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) {};
 void rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) {};

lib_standalone/Arduino.h

@@ -72,7 +72,6 @@ void   analogSetAttenuation(adc_attenuation_t attenuation);
 void   dacWrite(uint8_t pin, uint8_t value);
 double ledcSetup(uint8_t chan, double freq, uint8_t bit_num);
 void   ledcAttachPin(uint8_t pin, uint8_t chan);
-void   ledcAttach(uint8_t pin, uint8_t chan, uint8_t bit_num);
 void   ledcWrite(uint8_t chan, uint32_t duty);
 void   neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val);
 void   rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val);

mock-api/package.json

@@ -12,8 +12,8 @@
     "@msgpack/msgpack": "^3.1.3",
     "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "formidable": "^3.5.4",
-    "itty-router": "^5.0.23",
+    "itty-router": "^5.0.22",
     "prettier": "^3.8.1"
   },
-  "packageManager": "pnpm@10.32.1+sha512.a706938f0e89ac1456b6563eab4edf1d1faf3368d1191fc5c59790e96dc918e4456ab2e67d613de1043d2e8c81f87303e6b40d4ffeca9df15ef1ad567348f2be"
+  "packageManager": "pnpm@10.28.2+sha512.41872f037ad22f7348e3b1debbaf7e867cfd448f2726d9cf74c08f19507c31d2c8e7a11525b983febc2df640b5438dee6023ebb1f84ed43cc2d654d2bc326264"
 }

mock-api/pnpm-lock.yaml

@@ -18,8 +18,8 @@ importers:
         specifier: ^3.5.4
         version: 3.5.4
       itty-router:
-        specifier: ^5.0.23
+        specifier: ^5.0.22
-        version: 5.0.23
+        version: 5.0.22
       prettier:
         specifier: ^3.8.1
         version: 3.8.1
@@ -30,8 +30,8 @@ packages:
     resolution: {integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/generator@7.29.1':
+  '@babel/generator@7.29.0':
-    resolution: {integrity: sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==}
+    resolution: {integrity: sha512-vSH118/wwM/pLR38g/Sgk05sNtro6TlTJKuiMXDaZqPUfjTFcudpCOt00IhOfj+1BFAX+UFAlzCU+6WXr3GLFQ==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-globals@7.28.0':
@@ -46,8 +46,8 @@ packages:
     resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/parser@7.29.2':
+  '@babel/parser@7.29.0':
-    resolution: {integrity: sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==}
+    resolution: {integrity: sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
@@ -131,8 +131,8 @@ packages:
     resolution: {integrity: sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==}
     engines: {node: '>=14.0.0'}
 
-  itty-router@5.0.23:
+  itty-router@5.0.22:
-    resolution: {integrity: sha512-i49WU+SNPrwOZA4Z61En1RYd5h2Lcqa+5IvCpMrNi4dxymzJK15ozUUnRrWIUAv95Zamd4eJPAot2UvHRrQg7w==}
+    resolution: {integrity: sha512-9hmdGErWdYDOurGYxSbqLhy4EFReIwk71hMZTJ5b+zfa2zjMNV1ftFno2b8VjAQvX615gNB8Qxbl9JMRqHnIVA==}
 
   javascript-natural-sort@0.7.1:
     resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==}
@@ -148,8 +148,8 @@ packages:
   lodash-es@4.17.23:
     resolution: {integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==}
 
-  minimatch@9.0.9:
+  minimatch@9.0.5:
-    resolution: {integrity: sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==}
+    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
     engines: {node: '>=16 || 14 >=14.17'}
 
   ms@2.1.3:
@@ -183,9 +183,9 @@ snapshots:
       js-tokens: 4.0.0
       picocolors: 1.1.1
 
-  '@babel/generator@7.29.1':
+  '@babel/generator@7.29.0':
     dependencies:
-      '@babel/parser': 7.29.2
+      '@babel/parser': 7.29.0
       '@babel/types': 7.29.0
       '@jridgewell/gen-mapping': 0.3.13
       '@jridgewell/trace-mapping': 0.3.31
@@ -197,22 +197,22 @@ snapshots:
 
   '@babel/helper-validator-identifier@7.28.5': {}
 
-  '@babel/parser@7.29.2':
+  '@babel/parser@7.29.0':
     dependencies:
       '@babel/types': 7.29.0
 
   '@babel/template@7.28.6':
     dependencies:
       '@babel/code-frame': 7.29.0
-      '@babel/parser': 7.29.2
+      '@babel/parser': 7.29.0
       '@babel/types': 7.29.0
 
   '@babel/traverse@7.29.0':
     dependencies:
       '@babel/code-frame': 7.29.0
-      '@babel/generator': 7.29.1
+      '@babel/generator': 7.29.0
       '@babel/helper-globals': 7.28.0
-      '@babel/parser': 7.29.2
+      '@babel/parser': 7.29.0
       '@babel/template': 7.28.6
       '@babel/types': 7.29.0
       debug: 4.4.3
@@ -248,13 +248,13 @@ snapshots:
 
   '@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.8.1)':
     dependencies:
-      '@babel/generator': 7.29.1
+      '@babel/generator': 7.29.0
-      '@babel/parser': 7.29.2
+      '@babel/parser': 7.29.0
       '@babel/traverse': 7.29.0
       '@babel/types': 7.29.0
       javascript-natural-sort: 0.7.1
       lodash-es: 4.17.23
-      minimatch: 9.0.9
+      minimatch: 9.0.5
       parse-imports-exports: 0.2.4
       prettier: 3.8.1
     transitivePeerDependencies:
@@ -283,7 +283,7 @@ snapshots:
       dezalgo: 1.0.4
       once: 1.4.0
 
-  itty-router@5.0.23: {}
+  itty-router@5.0.22: {}
 
   javascript-natural-sort@0.7.1: {}
 
@@ -293,7 +293,7 @@ snapshots:
 
   lodash-es@4.17.23: {}
 
-  minimatch@9.0.9:
+  minimatch@9.0.5:
     dependencies:
       brace-expansion: 2.0.2
 

mock-api/restServer.ts

@@ -4564,7 +4564,7 @@ router
     let sorted_devices = [...emsesp_coredata.devices].sort((a, b) => a.t - b.t);
     // append emsesp_coredata to sorted_devices so Custom is always at the end of the list
     sorted_devices.push(emsesp_coredata_custom);
-    // return { connected: false, devices: [] }; // uncomment if simulating no devices...
+    // sorted_devices = []; // uncomment if simulating no devices...
     return { connected: true, devices: sorted_devices };
   })
   .get(EMSESP_SENSOR_DATA_ENDPOINT, () => {

platformio.ini

@@ -15,14 +15,15 @@ description                 = EMS-ESP Firmware for the ESP32
 src_dir                     = src
 lib_dir                     = lib
 boards_dir                  = boards
+; build_cache_dir = .pio/build_cache
 
 extra_configs =
   factory_settings.ini
   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_build_flags = -std=c++17 -std=gnu++17 -O3 -flto=auto -Wno-type-limits -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -Wno-format
-core_unbuild_flags = -std=gnu++11
+core_unbuild_flags = -std=gnu++11 -fno-lto
 
 my_build_flags =
 
@@ -53,21 +54,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.03.50/platform-espressif32.zip ; Tasmota Arduino Core 3.3.7 based on IDF 5.5.3.260313
-
 ; 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.03.50/platform-espressif32.zip ; Tasmota Arduino Core 3.3.7 based on IDF 5.5.3.260313
+platform = espressif32@6.12.0 ; Arduino Core 2.0.17 / IDF 4.4.7
 
 ; 32MB Flash variants
 [espressif32_base_32M]
@@ -75,7 +68,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.03.50/platform-espressif32.zip ; Tasmota Arduino Core 3.3.7 based on IDF 5.5.3.260313
+platform = espressif32@6.12.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 =
@@ -91,10 +106,9 @@ board_build.filesystem = littlefs
 lib_deps =
   bblanchon/ArduinoJson @ 7.4.2
   ESP32Async/AsyncTCP @ 3.4.10
-  ESP32Async/ESPAsyncWebServer @ 3.10.3
+  ESP32Async/ESPAsyncWebServer @ 3.10.2
-  https://github.com/mobizt/ReadyMail.git @ 0.3.8
+  https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.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]
@@ -106,17 +120,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
+; 4MB ESP32 - no SSL, no PSRAM - like a BBQKees older S32 and E32 models - uses Tasmota
-extends = espressif32_base_4M
+extends = espressif32_base_T_4M
 board = s_4M
 
 [env:s_16M]
-; 16MB ESP32 - no PSRAM - like a BBQKees later S32 V2 models
+; 16MB ESP32 - no PSRAM - like a BBQKees later S32 V2 models - uses Tasmota
-extends = espressif32_base_16M
+extends = espressif32_base_T_16M
 board = s_16M
 
 [env:s_16M_P]
@@ -135,19 +150,19 @@ extends = espressif32_base_32M
 board = s3_32M_P
 
 [env:s2_4M_P]
-; based on lolin_s2_mini 4MB with 2MB PSRAM
+; based on lolin_s2_mini 4MB with 2MB PSRAM - uses Tasmota
-extends = espressif32_base_4M
+extends = espressif32_base_T_4M
 board = s2_4M_P
 
 [env:c3_mini_4M]
-; based on lolin_c3_mini 4MB, no PSRAM
+; based on lolin_c3_mini 4MB, no PSRAM - uses Tasmota
-extends = espressif32_base_4M
+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}
@@ -159,7 +174,8 @@ 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/pioarduino/platform-espressif32/releases/download/55.03.30-2/platform-espressif32.zip ; Arduino Release v3.3.0 based on ESP-IDF v5.5.0 
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.21-2/platform-espressif32.zip ; Arduino Release v3.2.1 based on ESP-IDF v5.4.2
+; platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.30-2/platform-espressif32.zip ; Arduino Release v3.3.0 based on ESP-IDF v5.5.0 
 board = seeed_xiao_esp32c6
 build_flags =
   ${common.build_flags}
@@ -174,7 +190,6 @@ build_flags =
 build_src_flags =
   -DEMSESP_STANDALONE -DEMSESP_TEST
   -DARDUINOJSON_ENABLE_ARDUINO_STRING=1
-  -DNO_TLS_SUPPORT
   -std=gnu++17 -Og -ggdb
   -Wall -Wextra
   -Wno-unused-parameter -Wno-sign-compare -Wno-missing-braces
@@ -197,8 +212,6 @@ build_src_filter =
   -<../lib/uuid-syslog>
   -<../lib/eModbus>
   -<../lib/OneWire>
-  -<../lib/mbedtls_ssl/src>
-  -<../src/core/ModuleLibrary.cpp>
 lib_ldf_mode = off
 lib_deps =
 
@@ -215,7 +228,6 @@ 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
   -Wall -Wextra
@@ -242,8 +254,6 @@ build_src_filter =
   -<../lib/uuid-syslog>
   -<../lib/eModbus>
   -<../lib/OneWire>
-  -<../lib/mbedtls_ssl/src>
-  -<../src/core/ModuleLibrary.cpp>
 lib_ldf_mode = off
 lib_deps = Unity
 test_testing_command =

project-words.txt

@@ -1324,8 +1324,3 @@ zyxwvutsrqponmlkjihgfedcba
 ACAO
 ACAH
 ACAC
-coolingtype
-starttls
-recp
-READYCLIENT
-readymail

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

@@ -70,9 +70,9 @@ class APSettings {
     IPAddress subnetMask;
 
     bool operator==(const APSettings & settings) const {
-        return provisionMode == settings.provisionMode && channel == settings.channel && ssidHidden == settings.ssidHidden && maxClients == settings.maxClients
+        return provisionMode == settings.provisionMode && channel == settings.channel && ssidHidden == settings.ssidHidden
-               && localIP == settings.localIP && gatewayIP == settings.gatewayIP && subnetMask == settings.subnetMask && ssid == settings.ssid
+               && maxClients == settings.maxClients && localIP == settings.localIP && gatewayIP == settings.gatewayIP
-               && password == settings.password;
+               && subnetMask == settings.subnetMask && ssid == settings.ssid && password == settings.password;
     }
 
     static void              read(const APSettings & settings, JsonObject root);
@@ -104,6 +104,7 @@ class APSettingsService : public StatefulService<APSettings> {
     void startAP();
     void stopAP();
     void handleDNS();
+    void WiFiEvent(WiFiEvent_t event);
 };
 
 #endif

src/ESP32React/ArduinoJsonJWT.cpp

@@ -66,16 +66,21 @@ void ArduinoJsonJWT::parseJWT(String jwt, JsonDocument & jsonDocument) {
 }
 
 /*
- * HMAC-SHA256 using mbedtls
+ * ESP32 uses mbedtls, with decent HMAC implementations supporting sha256, as well as others.
+ * No need to pull in additional crypto libraries - lets use what we already have.
  */
 String ArduinoJsonJWT::sign(String & payload) {
     std::array<unsigned char, 32> hmacResult{};
-    mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256),
+    {
-                    reinterpret_cast<const unsigned char *>(_secret.c_str()),
+        mbedtls_md_context_t ctx;
-                    _secret.length(),
+        mbedtls_md_type_t    md_type = MBEDTLS_MD_SHA256;
-                    reinterpret_cast<const unsigned char *>(payload.c_str()),
+        mbedtls_md_init(&ctx);
-                    payload.length(),
+        mbedtls_md_setup(&ctx, mbedtls_md_info_from_type(md_type), 1);
-                    hmacResult.data());
+        mbedtls_md_hmac_starts(&ctx, reinterpret_cast<const unsigned char *>(_secret.c_str()), _secret.length());
+        mbedtls_md_hmac_update(&ctx, reinterpret_cast<const unsigned char *>(payload.c_str()), payload.length());
+        mbedtls_md_hmac_finish(&ctx, hmacResult.data());
+        mbedtls_md_free(&ctx);
+    }
     return encode(reinterpret_cast<const char *>(hmacResult.data()), hmacResult.size());
 }
 

src/ESP32React/ESP32React.cpp

@@ -84,5 +84,4 @@ void ESP32React::loop() {
     _networkSettingsService.loop();
     _apSettingsService.loop();
     _mqttSettingsService.loop();
-    _ntpSettingsService.loop();
 }

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,11 +20,28 @@ void NTPSettingsService::begin() {
     configureNTP();
 }
 
-void NTPSettingsService::loop() {
+// handles both WiFI and Ethernet
-    if (_connected != emsesp::EMSESP::system_.network_connected()) {
+void NTPSettingsService::WiFiEvent(WiFiEvent_t event) {
-        _connected = emsesp::EMSESP::system_.network_connected();
+    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;
+    }
 }
 
 // https://werner.rothschopf.net/microcontroller/202103_arduino_esp32_ntp_en.htm
@@ -37,11 +55,9 @@ void NTPSettingsService::configureNTP() {
     } else {
         setenv("TZ", _state.tzFormat.c_str(), 1);
         tzset();
-        if (esp_sntp_enabled()) {
         esp_sntp_stop();
     }
 }
-}
 
 void NTPSettingsService::configureTime(AsyncWebServerRequest * request, JsonVariant json) {
     if (json.is<JsonObject>()) {

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]) {
@@ -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: {
+#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
 
@@ -32,12 +32,21 @@ void NetworkStatus::networkStatus(AsyncWebServerRequest * request) {
     if (ethernet_connected) {
         // Ethernet
         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();
+#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();
         }
@@ -46,7 +55,11 @@ void NetworkStatus::networkStatus(AsyncWebServerRequest * request) {
         }
     } else if (wifi_status == WL_CONNECTED) {
         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/ModuleLibrary.cpp

@@ -1,31 +0,0 @@
-/*
- * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2025  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/>.
- */
-
-#include <Arduino.h>
-
-#include <emsesp.h>
-
-void ModuleLibrary::list(JsonObject output) {};
-
-void ModuleLibrary::loop() {};
-
-void ModuleLibrary::start(emsesp::EMSESP * emsesp_main, bool test_mode) {};
-
-bool ModuleLibrary::enable(const char * key, const char * license, bool enable) {
-    return true;
-};

src/core/ModuleLibrary.h

@@ -1,52 +0,0 @@
-/*
- * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2025  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 MODULELIBRARY_H
-#define MODULELIBRARY_H
-
-#include <Arduino.h>
-
-#include <memory>
-#include <vector>
-
-#include <emsesp.h>
-
-class ModuleLibrary {
-  public:
-    class Modules {
-      public:
-        Modules(const char * key, std::unique_ptr<Module> module)
-            : key(key)
-            , module(std::move(module)) {
-        }
-        const char *            key;
-        std::unique_ptr<Module> module;
-    };
-
-    void start(emsesp::EMSESP * emsesp_main, bool test_mode = false);
-    void loop();
-    void list(JsonObject output);
-    bool enable(const char * key, const char * license, bool enable);
-
-    static uuid::log::Logger logger_;
-
-  private:
-    std::vector<Modules> modules_;
-};
-
-#endif

src/core/analogsensor.cpp

@@ -346,13 +346,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);
@@ -1030,7 +1040,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/common.h

@@ -86,6 +86,6 @@ using string_vector = std::vector<const char *>;
 
 // Translation count - dynamically calculated at compile-time
 enum { EMSESP_TRANSLATION_COUNT_END = __COUNTER__ };
-static constexpr uint16_t EMSESP_TRANSLATION_COUNT = static_cast<int>(EMSESP_TRANSLATION_COUNT_END) - static_cast<int>(EMSESP_TRANSLATION_COUNT_START) - 1;
+static constexpr uint16_t EMSESP_TRANSLATION_COUNT = EMSESP_TRANSLATION_COUNT_END - EMSESP_TRANSLATION_COUNT_START - 1;
 
 #endif

src/core/default_settings.h

@@ -293,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/emsesp.cpp

@@ -84,7 +84,7 @@ uuid::log::Logger EMSESP::logger() {
 RxService         EMSESP::rxservice_;         // incoming Telegram Rx handler
 TxService         EMSESP::txservice_;         // outgoing Telegram Tx handler
 Mqtt              EMSESP::mqtt_;              // mqtt handler
-Modbus *          EMSESP::modbus_ = nullptr;  // modbus handler
+Modbus *          EMSESP::modbus_;            // modbus handler
 System            EMSESP::system_;            // core system services
 TemperatureSensor EMSESP::temperaturesensor_; // Temperature sensors
 AnalogSensor      EMSESP::analogsensor_;      // Analog sensors
@@ -1802,6 +1802,12 @@ void EMSESP::start() {
 #endif
     }
 
+    // start services
+    if (system_.modbus_enabled()) {
+        modbus_ = new Modbus;
+        modbus_->start(1, system_.modbus_port(), system_.modbus_max_clients(), system_.modbus_timeout() * 1000);
+    }
+
     mqtt_.start();                              // mqtt init
     system_.start();                            // starts commands, led, adc, button, network (sets hostname), syslog & uart
     shower_.start();                            // initialize shower timer and shower alert

src/core/helpers.h

@@ -20,7 +20,7 @@
 #define EMSESP_HELPERS_H
 
 #include "telegram.h" // for EMS_VALUE_* settings
-#include "emsesp_common.h"
+#include "common.h"
 
 namespace emsesp {
 

src/core/locale_common.h

@@ -47,7 +47,6 @@ MAKE_WORD(raw)
 MAKE_WORD(watch)
 MAKE_WORD(syslog)
 MAKE_WORD(send)
-MAKE_WORD(sendmail)
 MAKE_WORD(telegram)
 MAKE_WORD(bus_id)
 MAKE_WORD(tx_mode)

src/core/locale_translations.h

@@ -65,7 +65,6 @@ MAKE_WORD_TRANSLATION(commands_cmd, "list all commands", "Liste aller Kommandos"
 MAKE_WORD_TRANSLATION(entities_cmd, "list all entities", "Liste aller Entitäten", "lijst van alle entiteiten", "lista all entiteter", "wyświetl wszsytkie encje", "Viser alle enheter", "lister toutes les entités", "Tüm varlıkları listele", "elenca tutte le entità", "zobraziť všetky entity", "vypsat všechny entity")
 MAKE_WORD_TRANSLATION(metrics_cmd, "list all prometheus metrics", "Liste aller Prometheus Metriken", "lijst van alle Prometheus metriken", "lista alla Prometheus metriker", "wyświetl wszystkie Prometheus metryki", "Viser alle Prometheus metrikker", "lister toutes les métriques Prometheus", "Tüm Prometheus metriklerini listele", "elenca tutte le metriche Prometheus", "zobraziť všetky Prometheus metriky", "vypsat všechny Prometheus metriky")
 MAKE_WORD_TRANSLATION(send_cmd, "send a telegram", "Sende EMS-Telegramm", "stuur een telegram", "skicka ett telegram", "wyślij telegram", "send et telegram", "envoyer un télégramme", "Bir telegram gönder", "invia un telegramma", "poslať telegram", "odeslat telegram")
-MAKE_WORD_TRANSLATION(sendmail_cmd, "send email", "Sende eMail", "stuur email", "", "wyślij email", "send email", "", "email gönder", "invia email", "poslať email") // TODO translate
 MAKE_WORD_TRANSLATION(read_cmd, "send read request", "Sende Leseanfrage", "stuur leesaanvraag", "skicka en läsförfrågan", "wyślij żądanie odczytu", "send leseforespørsel", "envoyer une demande de lecture", "okuma isteği gönder", "invia richiesta di lettura", "odoslať žiadosť o prečítanie", "odeslat požadavek na čtení")
 MAKE_WORD_TRANSLATION(setiovalue_cmd, "set I/O value", "Setze Werte E/A", "instellen standaardwaarde", "sätt ett I/O-värde", "ustaw wartość", "sett en io verdi", "définir valeur E/S", "Giriş/Çıkış değerlerini ayarla", "imposta valore io", "nastaviť hodnotu io", "nastavit hodnotu I/O")
 MAKE_WORD_TRANSLATION(changeloglevel_cmd, "change log level", "Ändere Protokollebene", "aanpassen log niveau", "ändra logg-nivå", "zmień poziom log-u", "endre loggnivå", "changer le niveau de journal", "Kayıt seviyesini değiştir", "cambia livello registrazione", "zmeniť úroveň protokolu", "změnit úroveň protokolování")

src/core/modbus.cpp

@@ -52,7 +52,7 @@ void Modbus::stop() {
 #ifndef EMSESP_STANDALONE
     modbusServer_->stop();
     //     virtual ~ModbusServerTCPasync() = default;
-    delete modbusServer_;
+    // delete modbusServer_;
     modbusServer_ = nullptr;
 #endif
 }

src/core/mqtt.cpp

@@ -1184,8 +1184,7 @@ void Mqtt::add_ha_classes(JsonObject doc, const uint8_t device_type, const uint8
         doc[sc_ha] = sc_ha_measurement;
         doc[dc_ha] = "temperature";
         // override uom if fahrenheit
-        doc[uom_ha] = EMSESP::system_.fahrenheit() && uom != DeviceValueUOM::K ? DeviceValue::DeviceValueUOM_s[DeviceValueUOM::FAHRENHEIT]
+        doc[uom_ha] = EMSESP::system_.fahrenheit() ? DeviceValue::DeviceValueUOM_s[DeviceValueUOM::FAHRENHEIT] : DeviceValue::DeviceValueUOM_s[uom];
-                                                                               : DeviceValue::DeviceValueUOM_s[uom];
         break;
     case DeviceValueUOM::PERCENT:
         if (display_only) {

src/core/system.cpp

@@ -20,7 +20,6 @@
 #include "emsesp.h" // for send_raw_telegram() command
 
 #ifndef EMSESP_STANDALONE
-#include "esp_image_format.h"
 #include "esp_ota_ops.h"
 #include "esp_partition.h"
 #endif
@@ -53,15 +52,6 @@
 #include <esp_mac.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
-
 #ifndef EMSESP_STANDALONE
 #include "esp_efuse.h"
 #endif
@@ -134,110 +124,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;
-    ESP_SSLClient * ssl_client;
-    ReadyClient *   r_client; // rClient(ssl_client);
-    SMTPClient *    smtp;     // smtp(rClient);
-    basic_client = new WiFiClient;
-    ssl_client   = new ESP_SSLClient;
-    r_client     = new ReadyClient(*ssl_client);
-    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);
-
-    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 (";
@@ -470,13 +356,7 @@ void System::get_partition_info() {
             strftime(time_string, sizeof(time_string), "%FT%T", localtime(&d));
             p_info.install_date = d > 1500000000L ? time_string : "";
 
-            esp_image_metadata_t meta     = {};
+            p_info.size = part->size / 1024; // set size in KB
-            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;
         }
@@ -500,7 +380,7 @@ void System::set_partition_install_date() {
     snprintf(c, sizeof(c), "d_%s", current_partition);
     time_t d = EMSESP::nvs_.getULong(c, 0);
     if (d < 1500000000L) {
-        LOG_DEBUG("Setting the install date in partition %s", current_partition);
+        LOG_INFO("Firmware is fresh, setting the new install date in partition %s", current_partition);
         auto t = time(nullptr) - uuid::get_uptime_sec();
         EMSESP::nvs_.putULong(c, t);
     }
@@ -676,6 +556,11 @@ void System::store_settings(WebSettings & settings) {
     board_profile_  = settings.board_profile;
     telnet_enabled_ = settings.telnet_enabled;
 
+    modbus_enabled_     = settings.modbus_enabled;
+    modbus_port_        = settings.modbus_port;
+    modbus_max_clients_ = settings.modbus_max_clients;
+    modbus_timeout_     = settings.modbus_timeout;
+
     tx_mode_              = settings.tx_mode;
     syslog_enabled_       = settings.syslog_enabled;
     syslog_level_         = settings.syslog_level;
@@ -696,24 +581,6 @@ void System::store_settings(WebSettings & settings) {
 
     locale_         = settings.locale;
     developer_mode_ = settings.developer_mode;
-    // start services
-    if (settings.modbus_enabled) {
-        if (EMSESP::modbus_ == nullptr) {
-            EMSESP::modbus_ = new Modbus;
-            EMSESP::modbus_->start(1, settings.modbus_port, settings.modbus_max_clients, settings.modbus_timeout * 1000);
-        } else if (settings.modbus_port != modbus_port_ || settings.modbus_max_clients != modbus_max_clients_ || settings.modbus_timeout != modbus_timeout_) {
-            EMSESP::modbus_->stop();
-            EMSESP::modbus_->start(1, settings.modbus_port, settings.modbus_max_clients, settings.modbus_timeout * 1000);
-        }
-    } else if (EMSESP::modbus_ != nullptr) {
-        EMSESP::modbus_->stop();
-        delete EMSESP::modbus_;
-        EMSESP::modbus_ = nullptr;
-    }
-    modbus_enabled_     = settings.modbus_enabled;
-    modbus_port_        = settings.modbus_port;
-    modbus_max_clients_ = settings.modbus_max_clients;
-    modbus_timeout_     = settings.modbus_timeout;
 }
 
 // Starts up core services
@@ -737,11 +604,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) {
@@ -962,9 +838,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
@@ -1073,8 +956,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
@@ -1085,9 +973,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;
@@ -1139,7 +1031,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);
@@ -1343,7 +1234,7 @@ void System::show_system(uuid::console::Shell & shell) {
                        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(),
+                       partition.second.install_date.empty() ? "" : (std::string(", installed ") + partition.second.install_date).c_str(),
                        (strcmp(esp_ota_get_running_partition()->label, partition.first.c_str()) == 0) ? "** active **" : "");
     }
 
@@ -1374,9 +1265,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:
@@ -1407,9 +1305,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();
 
@@ -2307,15 +2211,6 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
     }
 #endif
 
-    // Modbus Status
-    node            = output["Modbus"].to<JsonObject>();
-    node["enabled"] = EMSESP::system_.modbus_enabled_;
-    if (EMSESP::system_.modbus_enabled_) {
-        node["maxClients"] = EMSESP::system_.modbus_max_clients_;
-        node["port"]       = EMSESP::system_.modbus_port_;
-        node["timeout"]    = EMSESP::system_.modbus_timeout_;
-    }
-
     // Sensor Status
     node = output["sensor"].to<JsonObject>();
     if (EMSESP::sensor_enabled()) {
@@ -2323,9 +2218,6 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
         node["temperatureSensorReads"] = EMSESP::temperaturesensor_.reads();
         node["temperatureSensorFails"] = EMSESP::temperaturesensor_.fails();
     }
-
-    node            = output["Analog"].to<JsonObject>();
-    node["enabled"] = EMSESP::analog_enabled();
     if (EMSESP::analog_enabled()) {
         node["analogSensors"]     = EMSESP::analogsensor_.count_entities();
         node["analogSensorReads"] = EMSESP::analogsensor_.reads();

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;
 
@@ -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);
@@ -494,7 +501,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/emsesp_version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.8.2-dev.C11"
+#define EMSESP_APP_VERSION "3.8.2-dev.11"

src/uart/emsuart_esp32.cpp

@@ -52,7 +52,7 @@ void EMSuart::uart_event_task(void * pvParameters) {
                     uart_read_bytes(EMSUART_NUM, telegram, length, portMAX_DELAY);
                     EMSESP::incoming_telegram(telegram, (uint8_t)(length - 1));
                 } else { // flush buffer up to break
-                    uint8_t buf[SOC_UART_FIFO_LEN];
+                    uint8_t buf[UART_FIFO_LEN];
                     uart_read_bytes(EMSUART_NUM, buf, length, portMAX_DELAY);
                 }
                 length = 0;
@@ -74,8 +74,12 @@ void EMSuart::start(const uint8_t tx_mode, const uint8_t rx_gpio, const uint8_t
                                      .stop_bits           = UART_STOP_BITS_1,
                                      .flow_ctrl           = UART_HW_FLOWCTRL_DISABLE,
                                      .rx_flow_ctrl_thresh = 0,
-                                     .source_clk          = UART_SCLK_APB,
+                                     .source_clk          = UART_SCLK_APB
-                                     .flags               = {0}};
+#if ESP_ARDUINO_VERSION_MAJOR >= 3
+                                     ,
+                                     .flags = {0, 0}
+#endif
+        };
 #if defined(EMSUART_RX_INVERT)
         inverse_mask |= UART_SIGNAL_RXD_INV;
 #endif
@@ -85,7 +89,7 @@ void EMSuart::start(const uint8_t tx_mode, const uint8_t rx_gpio, const uint8_t
         uart_param_config(EMSUART_NUM, &uart_config);
         uart_set_pin(EMSUART_NUM, tx_gpio, rx_gpio, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
         uart_set_line_inverse(EMSUART_NUM, inverse_mask);
-        uart_driver_install(EMSUART_NUM, SOC_UART_FIFO_LEN + 1, 0, (EMS_MAXBUFFERSIZE + 1) * 2, &uart_queue, 0); // buffer must be > fifo
+        uart_driver_install(EMSUART_NUM, UART_FIFO_LEN + 1, 0, (EMS_MAXBUFFERSIZE + 1) * 2, &uart_queue, 0); // buffer must be > fifo
         uart_set_rx_full_threshold(EMSUART_NUM, 1);
         uart_set_rx_timeout(EMSUART_NUM, 0); // disable
 

src/web/WebSettingsService.cpp

@@ -83,20 +83,6 @@ void WebSettings::read(WebSettings & settings, JsonObject root) {
     root["modbus_max_clients"]    = settings.modbus_max_clients;
     root["modbus_timeout"]        = settings.modbus_timeout;
     root["developer_mode"]        = settings.developer_mode;
-#ifndef NO_TLS_SUPPORT
-    root["email_enabled"]         = settings.email_enabled;
-#else
-    root["email_enabled"]         = false;
-#endif
-    root["email_ssl"]      = settings.email_ssl;
-    root["email_starttls"] = settings.email_starttls;
-    root["email_server"]   = settings.email_server;
-    root["email_port"]     = settings.email_port;
-    root["email_login"]    = settings.email_login;
-    root["email_pass"]     = settings.email_pass;
-    root["email_sender"]   = settings.email_sender;
-    root["email_recp"]     = settings.email_recp;
-    root["email_subject"]  = settings.email_subject;
 }
 
 // call on initialization and also when settings are updated/saved via web or console
@@ -257,9 +243,13 @@ StateUpdateResult WebSettings::update(JsonObject root, WebSettings & settings) {
 
     // Modbus settings
     settings.modbus_enabled = root["modbus_enabled"] | EMSESP_DEFAULT_MODBUS_ENABLED;
+    check_flag(original_settings.modbus_enabled, settings.modbus_enabled, ChangeFlags::RESTART);
     settings.modbus_port = root["modbus_port"] | EMSESP_DEFAULT_MODBUS_PORT;
+    check_flag(original_settings.modbus_port, settings.modbus_port, ChangeFlags::RESTART);
     settings.modbus_max_clients = root["modbus_max_clients"] | EMSESP_DEFAULT_MODBUS_MAX_CLIENTS;
+    check_flag(original_settings.modbus_max_clients, settings.modbus_max_clients, ChangeFlags::RESTART);
     settings.modbus_timeout = root["modbus_timeout"] | EMSESP_DEFAULT_MODBUS_TIMEOUT;
+    check_flag(original_settings.modbus_timeout, settings.modbus_timeout, ChangeFlags::RESTART);
 
     //
     // these may need mqtt restart to rebuild HA discovery topics
@@ -310,20 +300,6 @@ StateUpdateResult WebSettings::update(JsonObject root, WebSettings & settings) {
     settings.weblog_level   = root["weblog_level"] | EMSESP_DEFAULT_WEBLOG_LEVEL;
     settings.weblog_compact = root["weblog_compact"] | EMSESP_DEFAULT_WEBLOG_COMPACT;
 
-    settings.email_enabled  = root["email_enabled"] | FACTORY_EMAIL_ENABLE;
-    settings.email_ssl      = root["email_ssl"] | FACTORY_EMAIL_SSL;
-    settings.email_starttls = root["email_starttls"] | FACTORY_EMAIL_STARTTLS;
-    settings.email_server   = root["email_server"] | FACTORY_EMAIL_SERVER;
-    settings.email_port     = root["email_port"] | FACTORY_EMAIL_PORT;
-    settings.email_login    = root["email_login"] | FACTORY_EMAIL_LOGIN;
-    settings.email_pass     = root["email_pass"] | FACTORY_EMAIL_PASSWORD;
-    settings.email_sender   = root["email_sender"] | FACTORY_EMAIL_FROM;
-    settings.email_recp     = root["email_recp"] | FACTORY_EMAIL_TO;
-    settings.email_subject  = root["email_subject"] | FACTORY_EMAIL_SUBJECT;
-
-    if (settings.email_ssl && settings.email_starttls) {
-        settings.email_ssl = false;
-    }
     // if no psram limit weblog buffer to 25 messages
     if (EMSESP::system_.PSram() > 0) {
         settings.weblog_buffer = root["weblog_buffer"] | EMSESP_DEFAULT_WEBLOG_BUFFER;
@@ -482,14 +458,23 @@ void WebSettings::set_board_profile(WebSettings & settings) {
 #if CONFIG_IDF_TARGET_ESP32
         // check for no PSRAM, could be a E32 or S32?
         if (!ESP.getPsramSize()) {
+#if ESP_ARDUINO_VERSION_MAJOR < 3
+            if (ETH.begin(1, 16, 23, 18, ETH_PHY_LAN8720, ETH_CLOCK_GPIO0_IN)) {
+#else
             if (ETH.begin(ETH_PHY_LAN8720, 1, 23, 18, 16, ETH_CLOCK_GPIO0_IN)) {
+#endif
                 settings.board_profile = "E32"; // Ethernet without PSRAM
             } else {
                 settings.board_profile = "S32"; // ESP32 standard WiFi without PSRAM
             }
         } else {
 // check for boards with PSRAM, could be a E32V2 otherwise default back to the S32
+#if ESP_ARDUINO_VERSION_MAJOR < 3
+            if (ETH.begin(0, 15, 23, 18, ETH_PHY_LAN8720, ETH_CLOCK_GPIO0_OUT)) {
+#else
             if (ETH.begin(ETH_PHY_LAN8720, 0, 23, 18, 15, ETH_CLOCK_GPIO0_OUT)) {
+#endif
+
                 if (analogReadMilliVolts(39) > 700) {   // core voltage > 2.6V
                     settings.board_profile = "E32V2_2"; // Ethernet, PSRAM, internal sensors
                 } else {

src/web/WebSettingsService.h

@@ -26,36 +26,6 @@
 #define EMSESP_SETTINGS_SERVICE_PATH "/rest/settings"
 #define EMSESP_BOARD_PROFILE_SERVICE_PATH "/rest/boardProfile"
 
-#ifndef FACTORY_EMAIL_ENABLE
-#define FACTORY_EMAIL_ENABLE false
-#endif
-#ifndef FACTORY_EMAIL_SSL
-#define FACTORY_EMAIL_SSL false
-#endif
-#ifndef FACTORY_EMAIL_STARTTLS
-#define FACTORY_EMAIL_STARTTLS true
-#endif
-#ifndef FACTORY_EMAIL_PORT
-#define FACTORY_EMAIL_PORT 587
-#endif
-#ifndef FACTORY_EMAIL_SERVER
-#define FACTORY_EMAIL_SERVER "smtp.example.net"
-#endif
-#ifndef FACTORY_EMAIL_LOGIN
-#define FACTORY_EMAIL_LOGIN ""
-#endif
-#ifndef FACTORY_EMAIL_PASSWORD
-#define FACTORY_EMAIL_PASSWORD ""
-#endif
-#ifndef FACTORY_EMAIL_FROM
-#define FACTORY_EMAIL_FROM "ems-esp@example.net"
-#endif
-#ifndef FACTORY_EMAIL_TO
-#define FACTORY_EMAIL_TO ""
-#endif
-#ifndef FACTORY_EMAIL_SUBJECT
-#define FACTORY_EMAIL_SUBJECT "ems-esp notification"
-#endif
 namespace emsesp {
 
 class WebSettings {
@@ -107,16 +77,6 @@ class WebSettings {
     uint16_t modbus_port;
     uint8_t  modbus_max_clients;
     uint32_t modbus_timeout;
-    bool     email_enabled;
-    bool     email_ssl;
-    bool     email_starttls;
-    String   email_server;
-    uint16_t email_port;
-    String   email_login;
-    String   email_pass;
-    String   email_sender;
-    String   email_recp;
-    String   email_subject;
 
     uint8_t phy_type;
     int8_t  eth_power; // -1 means disabled