Merge remote-tracking branch 'origin/dev'

support filesystem ota

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +1,11 @@
 blank_issues_enabled: false
 contact_links:
   - name: EMS-ESP Docs
-    url: https://docs.emsesp.org
+    url: https://emsesp.org
     about: All the information related to EMS-ESP.
   - name: EMS-ESP Discussions and Support
     url: https://github.com/emsesp/EMS-ESP32/discussions
     about: EMS-ESP usage Questions, Feature Requests and Projects.
   - name: EMS-ESP Users Chat
-    url: https://discord.gg/3J3GgnzpyT
+    url: https://discord.gg/GP9DPSgeJq
     about: Chat for feedback, questions and troubleshooting.

.github/workflows/dev_release.yml

@@ -28,7 +28,7 @@ jobs:
           node-version: 24
 
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
   
       - name: Enable Corepack
         run: corepack enable pnpm
@@ -47,7 +47,7 @@ jobs:
 
       - name: Build webUI
         run: |
-          platformio run -e build_webUI
+          platformio run -e build-webUI
 
       - name: Build modbus
         run: |
@@ -62,35 +62,13 @@ jobs:
           platformio run
 
       - name: Commit the generated files
-        uses: stefanzweifel/git-auto-commit-action@v5
+        uses: stefanzweifel/git-auto-commit-action@v7
         with:
-          commit_message: "chore: update generated files"
-
-      - name: Configure Git
-        run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-
-      - name: Check for changes and commit
-        run: |
-          if [ -n "$(git status --porcelain)" ]; then
-            echo "Changes detected, committing..."
-            git add .
-            git commit -m "Auto-commit build artifacts and configuration updates
-
-            - Updated build configurations
-            - Generated build artifacts
-            - Version: ${{steps.build_info.outputs.VERSION}}"
-            
-            echo "Pushing changes to repository..."
-            git push origin dev
-          else
-            echo "No changes to commit"
-          fi
+          commit_message: "chore: update generated files for v${{steps.build_info.outputs.VERSION}}"
 
       - name: Create GitHub Release
         id: 'automatic_releases'
-        uses: emsesp/action-automatic-releases@v1.0.0
+        uses: emsesp/action-automatic-releases@v1.0.1
         with:
           repo_token: '${{ secrets.GITHUB_TOKEN }}'
           title: Development Build v${{steps.build_info.outputs.VERSION}}

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

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

.github/workflows/pr_check.yml

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

.github/workflows/sonar_check.yml

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

.github/workflows/stable_release.yml

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

.github/workflows/test_release.yml

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

.gitignore

@@ -2,7 +2,6 @@
 .vscode/c_cpp_properties.json
 .vscode/extensions.json
 .vscode/launch.json
-.vscode/settings.json
 
 # c++ compiling
 .clang_complete
@@ -73,5 +72,6 @@ logs/*
 sdkconfig.*
 sdkconfig_tasmota_esp32
 pnpm-lock.yaml
-package.json
-.cache/
+.cache/
+interface/.tsbuildinfo
+test/test_api/package-lock.json

CHANGELOG.md

@@ -5,6 +5,157 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.8.2] 12 May 2026
+
+## Added
+
+- comfortpoint for BC400 [#2935](https://github.com/emsesp/EMS-ESP32/issues/2935)
+- customize device brand [#2784](https://github.com/emsesp/EMS-ESP32/issues/2784)
+- set model for ems-esp devices temperature, analog, etc. [#2958](https://github.com/emsesp/EMS-ESP32/discussions/2958)
+- prometheus metrics for temperature/analog/scheduler/custom [#2962](https://github.com/emsesp/EMS-ESP32/issues/2962)
+- boiler pumpkick [#2965](https://github.com/emsesp/EMS-ESP32/discussions/2965)
+- heatpump reset [#2933](https://github.com/emsesp/EMS-ESP32/issues/2933)
+- 2.nd freshwater module (dhw4, dhw5) [#2991](https://github.com/emsesp/EMS-ESP32/issues/2991)
+- full system backup and restore
+- auto-logic to set ht3/ems+ tx-mode
+- polariity for digital_in sensors [#3070](https://github.com/emsesp/EMS-ESP32/discussions/3070)
+
+## Fixed
+
+- SRC climate creation [#2936](https://github.com/emsesp/EMS-ESP32/issues/2936) and [#2960](https://github.com/emsesp/EMS-ESP32/issues/2960)
+- missing translations [#3015](https://github.com/emsesp/EMS-ESP32/issues/3015)
+- custom entities check fetch length
+- modbus initialization [#3064](https://github.com/emsesp/EMS-ESP32/issues/3064)
+
+## Changed
+
+- weblogbuffer up to 1000 messages with PSRAM, mentioned in [#2933](https://github.com/emsesp/EMS-ESP32/issues/2933)
+- validate custom entity writes, [#2931](https://github.com/emsesp/EMS-ESP32/issues/2931)
+- remove wrong burnMinPower [#2918](https://github.com/emsesp/EMS-ESP32/issues/2918)
+- store scheduler active state to nvs [#2946](https://github.com/emsesp/EMS-ESP32/discussions/2946)
+- translated modes `heat` and `eco` for HA-climate mode-str-tpl
+- support `minflowtemp` and `baseflowtemp` [#2969](https://github.com/emsesp/EMS-ESP32/discussions/2969)
+- update version if it is 00.00 in first read [#2981](https://github.com/emsesp/EMS-ESP32/issues/2981)
+- device class for % values [#2980](https://github.com/emsesp/EMS-ESP32/issues/2980)
+- fetch telegrams: set length to fetch [#3017](https://github.com/emsesp/EMS-ESP32/issues/3017)
+- move http client from stack to heap
+- heap optimizations [#3021](https://github.com/emsesp/EMS-ESP32/discussions/3021)
+- check and read 0x470 as summer2_typeids[0] only if received [#2686](https://github.com/emsesp/EMS-ESP32/issues/2686), [#3055](https://github.com/emsesp/EMS-ESP32/issues/3055)
+- default bus-id: gateway1(0x49), tx-mode: auto
+
+## [3.8.1] 11 January 2026
+
+## Added
+
+- update time saved in nvs
+- heatpump entities [#2883](https://github.com/emsesp/EMS-ESP32/issues/2883)
+- HA input number format (mode) selectable box/slider (slider for max range 100) [#2900](https://github.com/emsesp/EMS-ESP32/discussions/2900)
+
+## Fixed
+
+- fix EMS bus disconnected errors on some systems [#2881](https://github.com/emsesp/EMS-ESP32/issues/2881)
+- selflowtemp fix [#2876](https://github.com/emsesp/EMS-ESP32/issues/2876)
+- updated valid GPIOs for ESP32S2, ESP32S3 and ESP32 that caused custom systems to block gpios [#2887](https://github.com/emsesp/EMS-ESP32/issues/2887)
+- Junkers wwcharge offset [#2860](https://github.com/emsesp/EMS-ESP32/issues/2860)
+- fixed minflowtemp [#2890](https://github.com/emsesp/EMS-ESP32/issues/2890)
+- don't add HA uom/classes for bool values [#2885](https://github.com/emsesp/EMS-ESP32/issues/2885)
+- fixed missing progress bar on web firmware uploads
+
+## Changed
+
+- snapshot gpios stored in temporary ram
+- GPIOs stored along with the name and reported in log if conflicting
+- free GPIOs depend on board profile [#2901](https://github.com/emsesp/EMS-ESP32/issues/2901)
+- prefer PSram for mqtt queue [#2889](https://github.com/emsesp/EMS-ESP32/issues/2889)
+- day schedule defult to all days, no day selected is not allowed
+- board profile `CUSTOM` can only be selected in developer mode
+- mqtt sends round values without decimals (`28` instead of `28.0`)
+
+## [3.8.0] 31 December 2025
+
+## Added
+
+- analogsensor types: NTC and RGB-Led
+- Flag for HMC310 [#2465](https://github.com/emsesp/EMS-ESP32/issues/2465)
+- boiler auxheatersource [#2489](https://github.com/emsesp/EMS-ESP32/discussions/2489)
+- thermostat last error for RC100/300 [#2501](https://github.com/emsesp/EMS-ESP32/issues/2501)
+- boiler 0xC6 telegram [#1963](https://github.com/emsesp/EMS-ESP32/issues/1963)
+- CS6800i changes [#2448](https://github.com/emsesp/EMS-ESP32/issues/2448), [#2449](https://github.com/emsesp/EMS-ESP32/issues/2449)
+- charging pump [#2544](https://github.com/emsesp/EMS-ESP32/issues/2544)
+- hybrid CSH5800iG [#2569](https://github.com/emsesp/EMS-ESP32/issues/2569)
+- added EMS Device details to Home Assistant MQTT Discovery
+- disinfection command [#2601](https://github.com/emsesp/EMS-ESP32/issues/2601)
+- added new board profile for upcoming BBQKees E32V2.2
+- set differential pressure entity in Mixer device
+- set set climate action cooling/heating in HA [#2583](https://github.com/emsesp/EMS-ESP32/issues/2583)
+- Internal sensors of E32V2_2
+- FW200 display options [#2610](https://github.com/emsesp/EMS-ESP32/discussions/2610)
+- CR11 mode settings OFF/MANUAL depends on selTemp [#2437](https://github.com/emsesp/EMS-ESP32/issues/2437)
+- implemented eFuse settings for BBQKees boards to store model type and ESP chipset
+- analogsensors for pulse output [#2624](https://github.com/emsesp/EMS-ESP32/discussions/2624)
+- analogsensors frequency input [#2631](https://github.com/emsesp/EMS-ESP32/discussions/2631)
+- SRC plus thermostats [#2636](https://github.com/emsesp/EMS-ESP32/issues/2636)
+- Greenstar 2000 [#2645](https://github.com/emsesp/EMS-ESP32/issues/2645)
+- RC3xx `dhw modetype` [#2659](https://github.com/emsesp/EMS-ESP32/discussions/2659)
+- new boiler entities VR0,VR1, compressor speed [#2669](https://github.com/emsesp/EMS-ESP32/issues/2669)
+- solar temperature TS16 [#2690](https://github.com/emsesp/EMS-ESP32/issues/2690)
+- pumpmode enum for HT3 boilers, add commands for manual defrost, chimneysweeper [#2727](https://github.com/emsesp/EMS-ESP32/issues/2727)
+- pid settings [#2735](https://github.com/emsesp/EMS-ESP32/issues/2735)
+- refresh MQTT button added to MQTT Settings page
+- heating assistance, rounding custum settings [#2763](https://github.com/emsesp/EMS-ESP32/discussions/2763)
+- added counter 0..2 for short pulses, high frequency [#2758](https://github.com/emsesp/EMS-ESP32/issues/2758)
+- added LWT (Last Will and Testament) to MQTT entities in Home Assistant
+- added api/metrics endpoint for prometheus integration by @gr3enk [#2774](https://github.com/emsesp/EMS-ESP32/pull/2774)
+- added RTL8201 to eth phy list [#2800](https://github.com/emsesp/EMS-ESP32/issues/2800)
+- added partitions to Web UI Version page, so previous firmware versions can be installed [#2837](https://github.com/emsesp/EMS-ESP32/issues/2837)
+- button pressures show LED. On a long press (10 seconds) the LED flashes for 5 seconds to indicate a factory reset is about to happen. [#2848](https://github.com/emsesp/EMS-ESP32/issues/2848)
+- added `txpause` command to pause the TX, by setting Txmode to 0 (disabled) [#2850](https://github.com/emsesp/EMS-ESP32/issues/2850)
+
+## Fixed
+
+- dhw/switchtime [#2490](https://github.com/emsesp/EMS-ESP32/issues/2490)
+- switch to secure mqtt [#2492](https://github.com/emsesp/EMS-ESP32/issues/2492)
+- update link buttons [#2497](https://github.com/emsesp/EMS-ESP32/issues/2497)
+- refresh scheduler states [#2502](https://github.com/emsesp/EMS-ESP32/discussions/2502)
+- also rebuild HA config on mqtt connect for scheduler, custom and shower
+- FB100 controls the hc, not the master [#2510](https://github.com/emsesp/EMS-ESP32/issues/2510)
+- IPM DHW module, [#2524](https://github.com/emsesp/EMS-ESP32/issues/2524)
+- charge optimization [#2543](https://github.com/emsesp/EMS-ESP32/issues/2543)
+- shower active state retained, shows correctly in HA
+- MQTT Command Topic with slashes [#2571](https://github.com/emsesp/EMS-ESP32/issues/2571)
+- Add pulsed water meter input to V1.3 gateway with Lilygo S3 [#2550](https://github.com/emsesp/EMS-ESP32/issues/2550)
+- fix missing long 10-second press of Button to perform a factory reset
+- fix wwMaxPower on Junkers ZBS14 [#2609](https://github.com/emsesp/EMS-ESP32/issues/2609)
+- ventilation bypass state from telegram 0x55C [#1197](https://github.com/emsesp/EMS-ESP32/issues/1197)
+- set selflowtemp for ems+ boilers [#2641](https://github.com/emsesp/EMS-ESP32/discussions/2641)
+- syslog timestamp [#2704](https://github.com/emsesp/EMS-ESP32/issues/2704)
+- fixed FS format command [#2720](https://github.com/emsesp/EMS-ESP32/discussions/2720)
+- dhw priority setting to boiler and mixer, telegrams 0x2CC, 0x2CD, etc.
+- check for valid GPIOs when board profile is changed [#2841](https://github.com/emsesp/EMS-ESP32/issues/2841)
+
+## Changed
+
+- show console log with ISO date/time [#2533](https://github.com/emsesp/EMS-ESP32/discussions/2533)
+- removed ESP32 CPU temperature
+- updated core libraries like AsyncTCP, AsyncWebServer and Modbus
+- remove command `scan deep`
+- ignore repeated `forceheatingoff` commands [#2641](https://github.com/emsesp/EMS-ESP32/discussions/2641)
+- optimized web for better performance by adding lazy loading and caching
+- internal system analog sensors (core_voltage, supply_voltage and gateway_temperature) cannot be accidentally removed
+- double click button reconnects EMS-ESP to AP
+- place system message command in side scheduler loop to reduce stack memory usage by 2KB
+- syslog mark interval set to 1 hour
+- handle process_telegram in oneloop
+- improved GPIO validation for Analog Sensors and System GPIOs
+- entities with no values are greyed out in the Web UI in the Customization page
+- added System Status to Web Status page
+- show number on entities and supported languages in log on boot
+- on tx read fail delay the 3rd. retry 2 sec
+- move vectors and lists to PSRAM
+- removed unused last topic/payload echo-check
+- added Home Assistant device details to MQTT Discovery for all devices
+- device_class and state_class changes for HA MQTT Discovery [#2825](https://github.com/emsesp/EMS-ESP32/issues/2825)
+
 ## [3.7.2] 22 March 2025
 
 ## Added
@@ -85,7 +236,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The automatically generated temperature sensor ID has replaced dashes (`-`) with underscores (`_`) to be compatible with Home Assistant.
 - `api/system/info` has it's JSON key names changed to camelCase syntax.
 
-For more details go to [docs.emsesp.org](https://docs.emsesp.org/).
+For more details go to [emsesp.org](https://emsesp.org/).
 
 ## Added
 

CHANGELOG_LATEST.md

@@ -1,71 +1,13 @@
 # Changelog
 
-For more details go to [docs.emsesp.org](https://docs.emsesp.org/).
+For more details go to [emsesp.org](https://emsesp.org/).
 
-## [3.7.3]
+## [3.8.3]
 
 ## Added
 
-- analogsensor types: NTC and RGB-Led
-- Flag for HMC310 [#2465](https://github.com/emsesp/EMS-ESP32/issues/2465)
-- boiler auxheatersource [#2489](https://github.com/emsesp/EMS-ESP32/discussions/2489)
-- thermostat last error for RC100/300 [#2501](https://github.com/emsesp/EMS-ESP32/issues/2501)
-- boiler 0xC6 telegram [#1963](https://github.com/emsesp/EMS-ESP32/issues/1963)
-- CS6800i changes [#2448](https://github.com/emsesp/EMS-ESP32/issues/2448), [#2449](https://github.com/emsesp/EMS-ESP32/issues/2449)
-- charging pump [#2544](https://github.com/emsesp/EMS-ESP32/issues/2544)
-- hybrid CSH5800iG [#2569](https://github.com/emsesp/EMS-ESP32/issues/2569)
-- add EMS Device details to Home Assistant MQTT Discovery
-- disinfection command [#2601](https://github.com/emsesp/EMS-ESP32/issues/2601)
-- added new board profile for upcoming BBQKees E32V2.2
-- set differential pressure entity in Mixer device
-- set set climate action cooling/heating in HA [#2583](https://github.com/emsesp/EMS-ESP32/issues/2583)
-- Internal sensors of E32V2_2
-- FW200 display options [#2610](https://github.com/emsesp/EMS-ESP32/discussions/2610)
-- CR11 mode settings OFF/MANUAL depends on selTemp [#2437](https://github.com/emsesp/EMS-ESP32/issues/2437)
-- implemented eFuse settings for BBQKees boards to store model type and ESP chipset
-- Analogsensors for pulse output [#2624](https://github.com/emsesp/EMS-ESP32/discussions/2624)
-- Analogsensors frequency input [#2631](https://github.com/emsesp/EMS-ESP32/discussions/2631)
-- SRC plus thermostats [#2636](https://github.com/emsesp/EMS-ESP32/issues/2636)
-- Greenstar 2000 [#2645](https://github.com/emsesp/EMS-ESP32/issues/2645)
-- RC3xx `dhw modetype` [#2659](https://github.com/emsesp/EMS-ESP32/discussions/2659)
-- new boiler entities VR0,VR1, compressor speed [#2669](https://github.com/emsesp/EMS-ESP32/issues/2669)
-- solar temperature TS16 [#2690](https://github.com/emsesp/EMS-ESP32/issues/2690)
-- pumpmode enum for HT3 boilers, add commands for manual defrost, chimneysweeper [#2727](https://github.com/emsesp/EMS-ESP32/issues/2727)
-- pid settings [#2735](https://github.com/emsesp/EMS-ESP32/issues/2735)
-- refresh MQTT button added to MQTT Settings page
-
 ## Fixed
 
-- dhw/switchtime [#2490](https://github.com/emsesp/EMS-ESP32/issues/2490)
-- switch to secure mqtt [#2492](https://github.com/emsesp/EMS-ESP32/issues/2492)
-- update link buttons [#2497](https://github.com/emsesp/EMS-ESP32/issues/2497)
-- refresh scheduler states [#2502](https://github.com/emsesp/EMS-ESP32/discussions/2502)
-- also rebuild HA config on mqtt connect for scheduler, custom and shower
-- FB100 controls the hc, not the master [#2510](https://github.com/emsesp/EMS-ESP32/issues/2510)
-- IPM DHW module, [#2524](https://github.com/emsesp/EMS-ESP32/issues/2524)
-- charge optimization [#2543](https://github.com/emsesp/EMS-ESP32/issues/2543)
-- shower active state retained, shows correctly in HA
-- MQTT Command Topic with slashes [#2571](https://github.com/emsesp/EMS-ESP32/issues/2571)
-- Add pulsed water meter input to V1.3 gateway with Lilygo S3 [#2550](https://github.com/emsesp/EMS-ESP32/issues/2550)
-- fix missing long 10-second press of Button to perform a factory reset
-- fix wwMaxPower on Junkers ZBS14 [#2609](https://github.com/emsesp/EMS-ESP32/issues/2609)
-- ventilation bypass state from telegram 0x55C [#1197](https://github.com/emsesp/EMS-ESP32/issues/1197)
-- set selflowtemp for ems+ boilers [#2641](https://github.com/emsesp/EMS-ESP32/discussions/2641)
-- syslog timestamp [#2704](https://github.com/emsesp/EMS-ESP32/issues/2704)
-- fixed FS format command [#2720](https://github.com/emsesp/EMS-ESP32/discussions/2720)
-- dhw priority setting to boiler and mixer, telegrams 0x2CC, 0x2CD, etc.
-
 ## Changed
 
-- show console log with ISO date/time [#2533](https://github.com/emsesp/EMS-ESP32/discussions/2533)
-- remove ESP32 CPU temperature
-- updated core libraries like AsyncTCP, AsyncWebServer and Modbus
-- remove command `scan deep`
-- ignore repeated `forceheatingoff` commands [#2641](https://github.com/emsesp/EMS-ESP32/discussions/2641)
-- optimized web for better performance by adding lazy loading and caching
-- internal system analog sensors (core_voltage, supply_voltage and gateway_temperature) cannot be accidentally removed
-- double click button reconnects EMS-ESP to AP
-- place system message command in side scheduler loop to reduce stack memory usage by 2KB
-- syslog mark interval set to 1 hour
-- handle process_telegram in oneloop
-- improved GPIO validation in Analog Sensors and System settings
+

CONTRIBUTING.md

@@ -6,7 +6,7 @@ Everybody is welcome and invited to contribute to the EMS-ESP Project by:
 
 - providing Pull Requests (Features, Fixes, suggestions)
 - testing new released features and report issues on your EMS equipment
-- contributing to missing [documentation](https://docs.emsesp.org)
+- contributing to missing [documentation](https://emsesp.org)
 
 This document describes rules that are in effect for this repository, meant for handling issues by contributors in the issue tracker and PRs.
 

Makefile

@@ -21,13 +21,14 @@ endif
 
 # Optimize parallel build configuration
 UNAME_S := $(shell uname -s)
+JOBS ?= 1
 ifeq ($(UNAME_S),Linux)
     EXTRA_CPPFLAGS = -D LINUX
-	JOBS ?= $(shell nproc)
+	JOBS := $(shell nproc)
 endif
 ifeq ($(UNAME_S),Darwin)
     EXTRA_CPPFLAGS = -D OSX -Wno-tautological-constant-out-of-range-compare
-	JOBS ?= $(shell sysctl -n hw.ncpu)
+	JOBS := $(shell sysctl -n hw.ncpu)
 endif
 
 # Set optimal parallel build settings
@@ -46,27 +47,28 @@ MAKEFLAGS += -j$(JOBS) -l$(shell echo $$(($(JOBS) * 2)))
 #----------------------------------------------------------------------
 TARGET    := emsesp
 BUILD     := build
-SOURCES   := src/core src/devices src/web src/test       lib_standalone lib/semver lib/espMqttClient/src lib/espMqttClient/src/*         lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/PButton 
-INCLUDES  := src/core src/devices src/web src/test lib/* lib_standalone lib/semver lib/espMqttClient/src lib/espMqttClient/src/Transport lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/uuid-telnet/src lib/uuid-syslog/src
+SOURCES   := src/core src/devices src/web src/test lib_standalone lib/espMqttClient/src lib/espMqttClient/src/*         lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/PButton 
+INCLUDES  := src/core src/devices src/web src/test lib_standalone lib/* lib/espMqttClient/src lib/espMqttClient/src/Transport lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/uuid-telnet/src lib/uuid-syslog/src
 LIBRARIES :=
 
 CPPCHECK = cppcheck
-CHECKFLAGS = -q --force --std=gnu++17
+CHECKFLAGS = -q --force --std=gnu++20
 
 #----------------------------------------------------------------------
 # Languages Standard
 #----------------------------------------------------------------------
-C_STANDARD   := -std=c17
-CXX_STANDARD := -std=gnu++17
+C_STANDARD   := -std=c20
+CXX_STANDARD := -std=gnu++20
 
 #----------------------------------------------------------------------
 # Defined Symbols
 #----------------------------------------------------------------------
-DEFINES += -DARDUINOJSON_ENABLE -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSON_USE_DOUBLE=0
+DEFINES += -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_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.7.3-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32S3\"
+DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32S3\"
 
 #----------------------------------------------------------------------
 # Sources & Files
@@ -78,6 +80,10 @@ SYMBOLS    := $(CURDIR)/$(BUILD)/$(TARGET).out
 CSOURCES   := $(shell find $(SOURCES) -name "*.c" 2>/dev/null)
 CXXSOURCES := $(shell find $(SOURCES) -name "*.cpp" 2>/dev/null)
 
+# Exclude files not needed for standalone build, if they exist
+CSOURCES   := $(filter-out src/core/ModuleLibrary.c,$(CSOURCES))
+CXXSOURCES := $(filter-out src/core/ModuleLibrary.cpp,$(CXXSOURCES))
+
 OBJS       := $(patsubst %,$(BUILD)/%.o,$(basename $(CSOURCES)) $(basename $(CXXSOURCES)))
 DEPS       := $(patsubst %,$(BUILD)/%.d,$(basename $(CSOURCES)) $(basename $(CXXSOURCES)))
 
@@ -137,6 +143,7 @@ DEPFLAGS   += -MF $(BUILD)/$*.d -MT $@
 LINK.o      = $(LD) $(LDFLAGS) $(LDLIBS) $^ -o $@
 COMPILE.c   = $(CC) $(C_STANDARD) $(CFLAGS) $(DEPFLAGS) -c $< -o $@
 COMPILE.cpp = $(CXX) $(CXX_STANDARD) $(CXXFLAGS) $(DEPFLAGS) -c $< -o $@
+COMPILE.s   = $(CC) $(CFLAGS) $(DEPFLAGS) -c $< -o $@
 
 #----------------------------------------------------------------------
 # Special Built-in Target
@@ -180,6 +187,7 @@ $(BUILD)/%.o: %.cpp
 
 $(BUILD)/%.o: %.s
 	@mkdir -p $(@D)
+	@$(ECHO) Compiling $@
 	@$(COMPILE.s)
 
 cppcheck: $(SOURCES)

README.md

@@ -15,10 +15,10 @@
   <a href="https://github.com/emsesp/EMS-ESP32/blob/dev/CONTRIBUTING.md">
     <img src="https://img.shields.io/badge/Contribute-ff4785?style=for-the-badge&logo=git&logoColor=white" alt="Contribute" />
   </a>
-  <a href="https://docs.emsesp.org">
+  <a href="https://emsesp.org">
     <img src="https://img.shields.io/badge/Documentation-0077b5?style=for-the-badge&logo=googledocs&logoColor=white" alt="Guides" />
   </a>
-  <a href="https://discord.gg/3J3GgnzpyT">
+  <a href="https://discord.gg/GP9DPSgeJq">
     <img src="https://img.shields.io/badge/Discord-7289da?style=for-the-badge&logo=discord&logoColor=white" alt="Discord" />
   </a>
   <a href="https://github.com/emsesp/EMS-ESP32/blob/main/CHANGELOG.md">
@@ -32,7 +32,8 @@
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=emsesp_EMS-ESP32&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=emsesp_EMS-ESP32)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/9441142f49424ef891e8f5251866ee6b)](https://app.codacy.com/gh/emsesp/EMS-ESP32/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![downloads](https://img.shields.io/github/downloads/emsesp/EMS-ESP32/total.svg)](https://github.com/emsesp/EMS-ESP32/releases)
-[![chat](https://img.shields.io/discord/816637840644505620.svg?style=flat-square&color=blueviolet)](https://discord.gg/3J3GgnzpyT)
+[![chat](https://img.shields.io/discord/816637840644505620.svg?style=flat-square&color=blueviolet)](https://discord.gg/GP9DPSgeJq)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/emsesp/EMS-ESP32)
 
 [![GitHub stars](https://img.shields.io/github/stars/emsesp/EMS-ESP32.svg?style=social&label=Star)](https://github.com/emsesp/EMS-ESP32/stargazers)
 [![GitHub forks](https://img.shields.io/github/forks/emsesp/EMS-ESP32.svg?style=social&label=Fork)](https://github.com/emsesp/EMS-ESP32/network)
@@ -40,7 +41,8 @@
 
 **EMS-ESP** is an open-source firmware for the Espressif ESP32 microcontroller to communicate with **EMS** (Energy Management System) compatible equipment from manufacturers such as Bosch, Buderus, Nefit, Junkers, Worcester, Sieger, elm.leblanc and iVT.
 
-It requires a small circuit to interface with the EMS bus which can be purchased from <https://bbqkees-electronics.nl> or custom built.
+It requires a small circuit to interface with the EMS bus which can be purchased from <https://bbqkees-electronics.nl>. These gateways are tested thoroughly and certified to work with EMS-ESP.
+
 
 ## 📦&nbsp; **Key Features**
 
@@ -60,33 +62,31 @@ It requires a small circuit to interface with the EMS bus which can be purchased
 
 ## 🚀&nbsp; **Installing**
 
-Head over to [download.emsesp.org](https://download.emsesp.org) for instructions on how to install EMS-ESP. There is also further details on which boards are supported in [this section](https://docs.emsesp.org/Installing/) of the documentation.
+Head over to the [Installation Guide](https://emsesp.org/Installing) section of the documentation for instructions on how to install EMS-ESP.
 
 ## 📋&nbsp; **Documentation**
 
-Visit [emsesp.org](https://docs.emsesp.org) for more details on how to install and configure EMS-ESP. There is also a collection of Frequently Asked Questions and Troubleshooting tips with example customizations from the community.
+Visit [emsesp.org](https://emsesp.org) for more details on how to setup and configure EMS-ESP. You'll also find more a collection of example configuarations, Frequently Asked Questions and Troubleshooting tips.
 
 ## 💬&nbsp; **Getting Support**
 
-To chat with the community reach out on our [Discord Server](https://discord.gg/3J3GgnzpyT).
+To chat with the community reach out on our [Discord Server](https://discord.gg/GP9DPSgeJq).
 
-If you find an issue or have a request, see [how to request support](https://docs.emsesp.org/Support/) on how to submit a bug report or feature request.
+If you find an issue or have a request, see the [Getting Support](https://emsesp.org/Support/) section of the documentation. Note if you are using a non-BBQKees EMS gateway, you may need to contact the manufacturer for support.
 
 ## 🎥&nbsp; **Live Demo**
 
-For a live demo go to [demo.emsesp.org](https://demo.emsesp.org). Pick a language from the sign on page and log in with any username or password. Note not all features are operational as it's based on static data.
+To see a live demo go to [demo.emsesp.org](https://demo.emsesp.org). Pick a language and use any username and password to log in. Note whast you're seeing is static example data so not all features are operational.
 
 ## 💖&nbsp; **Contributors**
 
-EMS-ESP is a project created by [proddy](https://github.com/proddy) and owned and maintained by both [proddy](https://github.com/proddy) and [MichaelDvP](https://github.com/MichaelDvP) with support from [BBQKees Electronics](https://bbqkees-electronics.nl).
+EMS-ESP is a project originally created by [proddy](https://github.com/proddy) and maintained by the ems-esp community.
 
 If you like **EMS-ESP**, please give it a ✨ on GitHub, or even better fork it and contribute. You can also offer a small donation. This is an open-source project maintained by volunteers, and your support is greatly appreciated.
 
 ## 📦&nbsp; **Building**
 
-To build the web interface only, run `platformio run -e build_webUI`. This will install the necessary dependencies and build the web interface and also create the embedded code used need to build the firmware. You can run the web interface locally by going to the `interface` directory and running `pnpm standalone`.
-
-To build the firmware, run `platformio run`. This will build the firmware for all ESP32 modules and place the binaries in the `build/firmware` folder. If you want to configure the build for a single platform create a local `pio_local.ni` file in the root directory (see example in `pio_local.ini_example`).
+See the [Building the firmware](https://emsesp.org/Building) guide in the documentation for instructions on how to build EMS-ESP from this source code.
 
 ## 📢&nbsp; **Libraries used**
 

SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report any security vulnerabilities using the [Contact Form](https://emsesp.org/About/#-contact).

boards/s2_4M_P.json

@@ -37,8 +37,8 @@
       "flash_size": "4MB",
       "maximum_ram_size": 327680,
       "maximum_size": 4194304,
-      "use_1200bps_touch": true,
-      "wait_for_upload_port": true,
+      "use_1200bps_touch": false,
+      "wait_for_upload_port": false,
       "require_upload_port": true,
       "speed": 921600
     },

boards/s3_32M_P.json

@@ -25,7 +25,7 @@
     "upload": {
       "flash_size": "32MB",
       "maximum_ram_size": 327680,
-      "maximum_size": 16777216,
+      "maximum_size": 33554432,
       "require_upload_port": true,
       "speed": 460800
     },

cspell.json

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

data/pre_load.json

@@ -1,85 +1,209 @@
 {
-    "type": "settings",
-    "Network": {
-      "ssid": "my_wifi_ssid",
-      "bssid": "",
-      "password": "my_wifi_password",
-      "hostname": "ems-esp"
+  "type": "systembackup",
+  "version": "3.8.2",
+  "systembackup": [
+    {
+      "type": "settings",
+      "Network": {
+        "ssid": "",
+        "bssid": "",
+        "password": "",
+        "hostname": "ems-esp",
+        "static_ip_config": false,
+        "bandwidth20": false,
+        "nosleep": true,
+        "enableMDNS": true,
+        "enableCORS": false,
+        "CORSOrigin": "*",
+        "tx_power": 0
+      },
+      "AP": {
+        "provision_mode": 1,
+        "ssid": "ems-esp",
+        "password": "ems-esp-neo",
+        "channel": 1,
+        "ssid_hidden": false,
+        "max_clients": 4,
+        "local_ip": "192.168.4.1",
+        "gateway_ip": "192.168.4.1",
+        "subnet_mask": "255.255.255.0"
+      },
+      "MQTT": {
+        "enableTLS": false,
+        "rootCA": "",
+        "enabled": false,
+        "host": "",
+        "port": 1883,
+        "base": "ems-esp",
+        "username": "",
+        "password": "",
+        "client_id": "esp32-b8ffc9ec",
+        "keep_alive": 60,
+        "clean_session": false,
+        "entity_format": 1,
+        "publish_time_boiler": 10,
+        "publish_time_thermostat": 10,
+        "publish_time_solar": 10,
+        "publish_time_mixer": 10,
+        "publish_time_water": 10,
+        "publish_time_other": 60,
+        "publish_time_sensor": 10,
+        "publish_time_heartbeat": 60,
+        "mqtt_qos": 0,
+        "mqtt_retain": false,
+        "ha_enabled": false,
+        "nested_format": 1,
+        "discovery_prefix": "homeassistant",
+        "discovery_type": 0,
+        "ha_number_mode": 0,
+        "publish_single": false,
+        "publish_single2cmd": false,
+        "send_response": false
+      },
+      "NTP": {
+        "enabled": false,
+        "server": "time.google.com",
+        "tz_label": "Europe/Amsterdam",
+        "tz_format": "CET-1CEST,M3.5.0,M10.5.0/3"
+      },
+      "Security": {
+        "jwt_secret": "ems-esp-neo",
+        "users": [
+          {
+            "username": "admin",
+            "password": "admin",
+            "admin": true
+          },
+          {
+            "username": "guest",
+            "password": "guest",
+            "admin": false
+          }
+        ]
+      },
+      "Settings": {
+        "version": "3.8.2-dev.22",
+        "board_profile": "E32V2_2",
+        "platform": "ESP32",
+        "locale": "en",
+        "tx_mode": 5,
+        "ems_bus_id": 73,
+        "syslog_enabled": false,
+        "syslog_level": 3,
+        "trace_raw": false,
+        "syslog_mark_interval": 0,
+        "syslog_host": "",
+        "syslog_port": 514,
+        "boiler_heatingoff": false,
+        "remote_timeout": 24,
+        "remote_timeout_en": false,
+        "shower_timer": false,
+        "shower_alert": false,
+        "shower_alert_coldshot": 10,
+        "shower_alert_trigger": 7,
+        "shower_min_duration": 180,
+        "rx_gpio": 4,
+        "tx_gpio": 5,
+        "dallas_gpio": 14,
+        "dallas_parasite": false,
+        "led_gpio": 32,
+        "hide_led": false,
+        "led_type": 1,
+        "low_clock": false,
+        "telnet_enabled": true,
+        "notoken_api": false,
+        "readonly_mode": false,
+        "analog_enabled": true,
+        "pbutton_gpio": 34,
+        "solar_maxflow": 30,
+        "fahrenheit": false,
+        "bool_format": 1,
+        "bool_dashboard": 1,
+        "enum_format": 1,
+        "weblog_level": 6,
+        "weblog_buffer": 50,
+        "weblog_compact": true,
+        "phy_type": 1,
+        "eth_power": 15,
+        "eth_phy_addr": 0,
+        "eth_clock_mode": 1,
+        "modbus_enabled": false,
+        "modbus_port": 502,
+        "modbus_max_clients": 10,
+        "modbus_timeout": 300,
+        "developer_mode": false
+      }
     },
-    "AP": {
-      "provision_mode": 2,
-      "ssid": "ems-esp",
-      "password": "ems-esp-neo",
-      "channel": 1,
-      "ssid_hidden": false,
-      "max_clients": 4,
-      "local_ip": "192.168.4.1",
-      "gateway_ip": "192.168.4.1",
-      "subnet_mask": "255.255.255.0"
+    {
+      "type": "schedule",
+      "Schedule": {
+        "schedule": []
+      }
     },
-    "MQTT": {
-      "enableTLS": false,
-      "rootCA": "",
-      "enabled": false,
-      "host": "127.0.0.1",
-      "port": 1883,
-      "base": "ems-esp",
-      "username": "username",
-      "password": "password",
-      "client_id": "ems-esp",
-      "entity_format": 1,
-      "publish_time_boiler": 10,
-      "publish_time_thermostat": 10,
-      "publish_time_solar": 10,
-      "publish_time_mixer": 10,
-      "publish_time_water": 10,
-      "publish_time_other": 60,
-      "publish_time_sensor": 10,
-      "publish_time_heartbeat": 60,
-      "mqtt_qos": 0,
-      "mqtt_retain": false,
-      "ha_enabled": false,
-      "nested_format": 1,
-      "discovery_prefix": "homeassistant",
-      "discovery_type": 0,
-      "publish_single": false,
-      "publish_single2cmd": false,
-      "send_response": false
+    {
+      "type": "customizations",
+      "Customizations": {
+        "ts": [
+          {
+            "id": "28_1767_7B13_2502",
+            "name": "gateway_temperature",
+            "offset": 0,
+            "is_system": true
+          }
+        ],
+        "as": [
+          {
+            "gpio": 39,
+            "name": "core_voltage",
+            "offset": 0,
+            "factor": 0.003771,
+            "uom": 23,
+            "type": 3,
+            "is_system": true
+          },
+          {
+            "gpio": 36,
+            "name": "supply_voltage",
+            "offset": 0,
+            "factor": 0.017,
+            "uom": 23,
+            "type": 3,
+            "is_system": true
+          },
+          {
+            "gpio": 2,
+            "name": "led",
+            "offset": 0,
+            "factor": 1,
+            "uom": 0,
+            "type": 6,
+            "is_system": true
+          }
+        ],
+        "masked_entities": []
+      }
     },
-    "NTP": {
-      "enabled": true,
-      "server": "time.google.com",
-      "tz_label": "Europe/Amsterdam",
-      "tz_format": "CET-1CEST,M3.5.0,M10.5.0/3"
+    {
+      "type": "entities",
+      "Entities": {
+        "entities": []
+      }
     },
-    "Security": {
-      "jwt_secret": "ems-esp-neo",
-      "users": [
+    {
+      "type": "modules",
+      "Modules": {
+        "modules": []
+      }
+    },
+    {
+      "type": "nvs",
+      "nvs": [
         {
-          "username": "admin",
-          "password": "admin",
-          "admin": true
-        },
-        {
-          "username": "guest",
-          "password": "guest",
-          "admin": false
+          "type": 1,
+          "key": "fresh_firmware",
+          "value": 0
         }
       ]
-    },
-    "Settings": {
-      "board_profile": "S3",
-      "locale": "en",
-      "tx_mode": 1,
-      "ems_bus_id": 11,
-      "boiler_heatingoff": false,
-      "hide_led": true,
-      "telnet_enabled": true,
-      "notoken_api": false,
-      "analog_enabled": true,
-      "fahrenheit": false,
-      "bool_format": 1,
-      "bool_dashboard": 1,
-      "enum_format": 1
     }
-  }
+  ]
+}

docs/dump_telegrams.csv

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

interface/.typesafe-i18n.json

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

interface/eslint.config.js

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

interface/package.json

@@ -1,6 +1,6 @@
 {
   "name": "EMS-ESP",
-  "version": "3.7.3",
+  "version": "3.8.2",
   "description": "EMS-ESP WebUI",
   "homepage": "https://emsesp.org",
   "author": "proddy, emsesp.org",
@@ -12,60 +12,60 @@
     "dev": "vite dev",
     "build": "vite build",
     "preview": "vite preview",
-    "build-hosted": "typesafe-i18n && vite build --mode hosted",
+    "build-hosted": "typesafe-i18n --no-watch && vite build --mode hosted",
     "mock-rest": "bun --watch ../mock-api/restServer.ts",
     "preview-standalone": "typesafe-i18n --no-watch && vite build && concurrently -c \"auto\" \"pnpm:mock-rest\" \"vite preview\"",
     "standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite dev\"",
     "typesafe-i18n": "typesafe-i18n --no-watch",
-    "build_webUI": "typesafe-i18n --no-watch && vite build && node progmem-generator.js",
+    "build-webUI": "typesafe-i18n --no-watch && vite build && node progmem-generator.js",
     "format": "prettier -l -w '**/*.{ts,tsx,js,css,json,md}'",
     "lint": "eslint . --fix",
     "standalone-devcontainer": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite --host\""
   },
   "dependencies": {
-    "@alova/adapter-xhr": "2.2.1",
+    "@alova/adapter-xhr": "2.3.1",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@mui/icons-material": "^7.3.5",
-    "@mui/material": "^7.3.5",
-    "@preact/compat": "^18.3.1",
+    "@mui/icons-material": "^9.0.1",
+    "@mui/material": "^9.0.1",
+    "@preact/compat": "^18.3.2",
     "@table-library/react-table-library": "4.1.15",
-    "alova": "3.3.4",
+    "alova": "3.5.1",
     "async-validator": "^4.2.5",
     "etag": "^1.8.1",
     "formidable": "^3.5.4",
     "jwt-decode": "^4.0.0",
     "magic-string": "^0.30.21",
-    "mime-types": "^3.0.1",
-    "preact": "^10.27.2",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
-    "react-icons": "^5.5.0",
-    "react-router": "^7.9.6",
-    "react-toastify": "^11.0.5",
-    "typesafe-i18n": "^5.26.2",
-    "typescript": "^5.9.3"
+    "mime-types": "^3.0.2",
+    "preact": "^10.29.1",
+    "react": "^19.2.6",
+    "react-dom": "^19.2.6",
+    "react-icons": "^5.6.0",
+    "react-router": "^7.15.0",
+    "react-toastify": "^11.1.0",
+    "typesafe-i18n": "^5.27.1",
+    "typescript": "^6.0.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.28.5",
-    "@eslint/js": "^9.39.1",
-    "@preact/compat": "^18.3.1",
-    "@preact/preset-vite": "^2.10.2",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.0",
-    "@types/node": "^24.10.1",
-    "@types/react": "^19.2.5",
+    "@babel/core": "^7.29.0",
+    "@eslint/js": "^10.0.1",
+    "@preact/compat": "^18.3.2",
+    "@preact/preset-vite": "^2.10.5",
+    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
+    "@types/node": "^25.7.0",
+    "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
-    "axe-core": "^4.11.0",
+    "axe-core": "^4.11.4",
     "concurrently": "^9.2.1",
-    "eslint": "^9.39.1",
+    "eslint": "^10.3.0",
     "eslint-config-prettier": "^10.1.8",
-    "prettier": "^3.6.2",
-    "rollup-plugin-visualizer": "^6.0.5",
-    "terser": "^5.44.1",
-    "typescript-eslint": "^8.46.4",
-    "vite": "^7.2.2",
+    "prettier": "^3.8.3",
+    "rollup-plugin-visualizer": "^7.0.1",
+    "terser": "^5.47.1",
+    "typescript-eslint": "^8.59.3",
+    "vite": "^8.0.12",
     "vite-plugin-imagemin": "^0.6.1",
-    "vite-tsconfig-paths": "^5.1.4"
+    "vite-tsconfig-paths": "^6.1.1"
   },
-  "packageManager": "pnpm@10.22.0+sha512.bf049efe995b28f527fd2b41ae0474ce29186f7edcb3bf545087bd61fbbebb2bf75362d1307fda09c2d288e1e499787ac12d4fcb617a974718a6051f2eee741c"
+  "packageManager": "pnpm@10.33.4+sha512.1c67b3b359b2d408119ba1ed289f34b8fc3c6873412bec6fd264fbdc82489e510fcbecb9ce9d22dae7f3b76269d8441046014bdca53b9979cd7a561ad631b800"
 }

interface/progmem-generator.js

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

interface/src/App.tsx

@@ -8,7 +8,6 @@ import type { Locales } from 'i18n/i18n-types';
 import { loadLocaleAsync } from 'i18n/i18n-util.async';
 import { detectLocale, navigatorDetector } from 'typesafe-i18n/detectors';
 
-// Memoize available locales to prevent recreation on every render
 const AVAILABLE_LOCALES = [
   'de',
   'en',

interface/src/AppRouting.tsx

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

interface/src/AuthenticatedRouting.tsx

@@ -1,86 +1,77 @@
-import { Suspense, lazy, memo, useContext } from 'react';
+import { memo, useContext } from 'react';
 import { Navigate, Route, Routes } from 'react-router';
 
-import { Layout, LoadingSpinner } from 'components';
+import CustomEntities from 'app/main/CustomEntities';
+import Customizations from 'app/main/Customizations';
+import Dashboard from 'app/main/Dashboard';
+import Devices from 'app/main/Devices';
+import Help from 'app/main/Help';
+import Modules from 'app/main/Modules';
+import Scheduler from 'app/main/Scheduler';
+import Sensors from 'app/main/Sensors';
+import UserProfile from 'app/main/UserProfile';
+import APSettings from 'app/settings/APSettings';
+import ApplicationSettings from 'app/settings/ApplicationSettings';
+import DownloadUpload from 'app/settings/DownloadUpload';
+import MqttSettings from 'app/settings/MqttSettings';
+import NTPSettings from 'app/settings/NTPSettings';
+import Settings from 'app/settings/Settings';
+import Network from 'app/settings/network/Network';
+import Security from 'app/settings/security/Security';
+import APStatus from 'app/status/APStatus';
+import Activity from 'app/status/Activity';
+import HardwareStatus from 'app/status/HardwareStatus';
+import MqttStatus from 'app/status/MqttStatus';
+import NTPStatus from 'app/status/NTPStatus';
+import NetworkStatus from 'app/status/NetworkStatus';
+import Status from 'app/status/Status';
+import SystemLog from 'app/status/SystemLog';
+import Version from 'app/status/Version';
+import { Layout } from 'components';
 import { AuthenticatedContext } from 'contexts/authentication';
 
-// Lazy load all route components for better code splitting
-const Dashboard = lazy(() => import('app/main/Dashboard'));
-const Devices = lazy(() => import('app/main/Devices'));
-const Sensors = lazy(() => import('app/main/Sensors'));
-const Help = lazy(() => import('app/main/Help'));
-const Customizations = lazy(() => import('app/main/Customizations'));
-const Scheduler = lazy(() => import('app/main/Scheduler'));
-const CustomEntities = lazy(() => import('app/main/CustomEntities'));
-const Modules = lazy(() => import('app/main/Modules'));
-const UserProfile = lazy(() => import('app/main/UserProfile'));
-
-const Status = lazy(() => import('app/status/Status'));
-const HardwareStatus = lazy(() => import('app/status/HardwareStatus'));
-const Activity = lazy(() => import('app/status/Activity'));
-const SystemLog = lazy(() => import('app/status/SystemLog'));
-const MqttStatus = lazy(() => import('app/status/MqttStatus'));
-const NTPStatus = lazy(() => import('app/status/NTPStatus'));
-const APStatus = lazy(() => import('app/status/APStatus'));
-const NetworkStatus = lazy(() => import('app/status/NetworkStatus'));
-const Version = lazy(() => import('app/status/Version'));
-
-const Settings = lazy(() => import('app/settings/Settings'));
-const ApplicationSettings = lazy(() => import('app/settings/ApplicationSettings'));
-const MqttSettings = lazy(() => import('app/settings/MqttSettings'));
-const NTPSettings = lazy(() => import('app/settings/NTPSettings'));
-const APSettings = lazy(() => import('app/settings/APSettings'));
-const DownloadUpload = lazy(() => import('app/settings/DownloadUpload'));
-const Network = lazy(() => import('app/settings/network/Network'));
-const Security = lazy(() => import('app/settings/security/Security'));
-
 const AuthenticatedRouting = memo(() => {
   const { me } = useContext(AuthenticatedContext);
   return (
     <Layout>
-      <Suspense fallback={<LoadingSpinner />}>
-        <Routes>
-          <Route path="/dashboard/*" element={<Dashboard />} />
-          <Route path="/devices/*" element={<Devices />} />
-          <Route path="/sensors/*" element={<Sensors />} />
-          <Route path="/help/*" element={<Help />} />
-          <Route path="/user/*" element={<UserProfile />} />
+      <Routes>
+        <Route path="/dashboard/*" element={<Dashboard />} />
+        <Route path="/devices/*" element={<Devices />} />
+        <Route path="/sensors/*" element={<Sensors />} />
+        <Route path="/help/*" element={<Help />} />
+        <Route path="/user/*" element={<UserProfile />} />
 
-          <Route path="/status/*" element={<Status />} />
-          <Route path="/status/hardwarestatus/*" element={<HardwareStatus />} />
-          <Route path="/status/activity" element={<Activity />} />
-          <Route path="/status/log" element={<SystemLog />} />
-          <Route path="/status/mqtt" element={<MqttStatus />} />
-          <Route path="/status/ntp" element={<NTPStatus />} />
-          <Route path="/status/ap" element={<APStatus />} />
-          <Route path="/status/network" element={<NetworkStatus />} />
-          <Route path="/status/version" element={<Version />} />
+        <Route path="/status/*" element={<Status />} />
+        <Route path="/status/hardwarestatus/*" element={<HardwareStatus />} />
+        <Route path="/status/activity" element={<Activity />} />
+        <Route path="/status/log" element={<SystemLog />} />
+        <Route path="/status/mqtt" element={<MqttStatus />} />
+        <Route path="/status/ntp" element={<NTPStatus />} />
+        <Route path="/status/ap" element={<APStatus />} />
+        <Route path="/status/network" element={<NetworkStatus />} />
+        <Route path="/status/version" element={<Version />} />
 
-          {me.admin && (
-            <>
-              <Route path="/settings" element={<Settings />} />
-              <Route
-                path="/settings/application"
-                element={<ApplicationSettings />}
-              />
-              <Route path="/settings/mqtt" element={<MqttSettings />} />
-              <Route path="/settings/ntp" element={<NTPSettings />} />
-              <Route path="/settings/ap" element={<APSettings />} />
-              <Route path="/settings/modules" element={<Modules />} />
-              <Route path="/settings/downloadUpload" element={<DownloadUpload />} />
+        {me.admin && (
+          <>
+            <Route path="/settings" element={<Settings />} />
+            <Route path="/settings/application" element={<ApplicationSettings />} />
+            <Route path="/settings/mqtt" element={<MqttSettings />} />
+            <Route path="/settings/ntp" element={<NTPSettings />} />
+            <Route path="/settings/ap" element={<APSettings />} />
+            <Route path="/settings/modules" element={<Modules />} />
+            <Route path="/settings/downloadUpload" element={<DownloadUpload />} />
 
-              <Route path="/settings/network/*" element={<Network />} />
-              <Route path="/settings/security/*" element={<Security />} />
+            <Route path="/settings/network/*" element={<Network />} />
+            <Route path="/settings/security/*" element={<Security />} />
 
-              <Route path="/customizations" element={<Customizations />} />
-              <Route path="/scheduler" element={<Scheduler />} />
-              <Route path="/customentities" element={<CustomEntities />} />
-            </>
-          )}
+            <Route path="/customizations" element={<Customizations />} />
+            <Route path="/scheduler" element={<Scheduler />} />
+            <Route path="/customentities" element={<CustomEntities />} />
+          </>
+        )}
 
-          <Route path="/*" element={<Navigate to="/" />} />
-        </Routes>
-      </Suspense>
+        <Route path="/*" element={<Navigate to="/" />} />
+      </Routes>
     </Layout>
   );
 });

interface/src/CustomTheme.tsx

@@ -11,17 +11,15 @@ import { createTheme } from '@mui/material/styles';
 
 import type { RequiredChildrenProps } from 'utils';
 
-// Memoize dialog style to prevent recreation
 export const dialogStyle = {
   '& .MuiDialog-paper': {
     borderRadius: '8px',
     borderColor: '#565656',
     borderStyle: 'solid',
-    borderWidth: '1px'
+    borderWidth: '2px'
   }
 } as const;
 
-// Memoize theme creation to prevent recreation
 const theme = responsiveFontSizes(
   createTheme({
     typography: {

interface/src/SignIn.tsx

@@ -1,8 +1,9 @@
-import { memo, useCallback, useContext, useMemo, useState } from 'react';
+import { memo, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { toast } from 'react-toastify';
 
 import ForwardIcon from '@mui/icons-material/Forward';
 import { Box, Button, Paper, Typography } from '@mui/material';
+import type { Theme } from '@mui/material/styles';
 
 import * as AuthenticationApi from 'components/routing/authentication';
 import { useRequest } from 'alova/client';
@@ -17,7 +18,7 @@ import { PROJECT_NAME } from 'env';
 import { useI18nContext } from 'i18n/i18n-react';
 import type { SignInRequest } from 'types';
 import { onEnterCallback, updateValue } from 'utils';
-import { SIGN_IN_REQUEST_VALIDATOR, validate } from 'validators';
+import { SIGN_IN_REQUEST_VALIDATOR, ValidationError, validate } from 'validators';
 
 const SignIn = memo(() => {
   const authenticationContext = useContext(AuthenticationContext);
@@ -36,7 +37,7 @@ const SignIn = memo(() => {
     {
       immediate: false
     }
-  ).onSuccess((response) => {
+  ).onSuccess((response: { data: { access_token: string } }) => {
     if (response.data) {
       authenticationContext.signIn(response.data.access_token);
     }
@@ -73,23 +74,33 @@ const SignIn = memo(() => {
       await validate(SIGN_IN_REQUEST_VALIDATOR, signInRequest);
       await signIn();
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
       setProcessing(false);
     }
   }, [signInRequest, signIn, LL]);
 
-  // Memoize callback to prevent recreation on every render
   const submitOnEnter = useMemo(() => onEnterCallback(signIn), [signIn]);
 
+  // get rid of scrollbar
+  useEffect(() => {
+    const originalOverflow = document.body.style.overflow;
+    document.body.style.overflow = 'hidden';
+    return () => {
+      document.body.style.overflow = originalOverflow;
+    };
+  }, []);
+
   return (
     <Box
-      display="flex"
-      height="100vh"
-      margin="auto"
-      padding={2}
-      justifyContent="center"
-      flexDirection="column"
-      maxWidth={(theme) => theme.breakpoints.values.sm}
+      sx={(theme: Theme) => ({
+        display: 'flex',
+        height: '100vh',
+        margin: 'auto',
+        padding: 2,
+        justifyContent: 'center',
+        flexDirection: 'column',
+        maxWidth: theme.breakpoints.values.sm
+      })}
     >
       <Paper
         sx={(theme) => ({
@@ -102,23 +113,29 @@ const SignIn = memo(() => {
           width: '100%'
         })}
       >
-        <Typography variant="h4">{PROJECT_NAME}</Typography>
-
+        <Typography sx={{ mb: 1 }} variant="h4">
+          {PROJECT_NAME}
+        </Typography>
         <LanguageSelector />
-
-        <Box display="flex" flexDirection="column" alignItems="center">
+        <Box
+          sx={{
+            mt: 1,
+            display: 'flex',
+            flexDirection: 'column',
+            gap: 1,
+            alignItems: 'center'
+          }}
+        >
           <ValidatedTextField
             fieldErrors={fieldErrors || {}}
             disabled={processing}
             sx={{
-              width: 240
+              width: '32ch'
             }}
             name="username"
             label={LL.USERNAME(0)}
             value={signInRequest.username}
             onChange={updateLoginRequestValue}
-            margin="normal"
-            variant="outlined"
             slotProps={{
               input: {
                 autoCapitalize: 'none',
@@ -130,14 +147,13 @@ const SignIn = memo(() => {
             fieldErrors={fieldErrors || {}}
             disabled={processing}
             sx={{
-              width: 240
+              width: '32ch'
             }}
             name="password"
             label={LL.PASSWORD()}
             value={signInRequest.password}
             onChange={updateLoginRequestValue}
             onKeyDown={submitOnEnter}
-            variant="outlined"
           />
         </Box>
 

interface/src/app/main/CustomEntities.tsx

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

interface/src/app/main/CustomEntitiesDialog.tsx

@@ -7,7 +7,7 @@ import DoneIcon from '@mui/icons-material/Done';
 import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined';
 import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
 import InsertCommentOutlinedIcon from '@mui/icons-material/InsertCommentOutlined';
-import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
+import RemoveIcon from '@mui/icons-material/RemoveCircleOutlined';
 import {
   Box,
   Button,
@@ -28,7 +28,7 @@ import type { ValidateFieldsError } from 'async-validator';
 import { BlockFormControlLabel, ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValue } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 
 import { DeviceValueType, DeviceValueTypeNames, DeviceValueUOM_s } from './types';
 import type { EntityItem } from './types';
@@ -136,7 +136,7 @@ const CustomEntitiesDialog = ({
       }
       onSave(processedItem);
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [validator, editItem, onSave]);
 
@@ -178,7 +178,7 @@ const CustomEntitiesDialog = ({
               onChange={updateFormValue}
             />
           </Grid>
-          <Grid mt={3}>
+          <Grid sx={{ mt: 3 }}>
             <BlockFormControlLabel
               control={
                 <Checkbox
@@ -205,16 +205,17 @@ const CustomEntitiesDialog = ({
             >
               <MenuItem value={0}>EMS-{LL.VALUE(1)}</MenuItem>
               <MenuItem value={1}>RAM-{LL.VALUE(1)}</MenuItem>
+              <MenuItem value={2}>NVS-{LL.VALUE(1)}</MenuItem>
             </TextField>
           </Grid>
-          {editItem.ram === 1 && (
+          {editItem.ram > 0 && (
             <>
               <Grid>
                 <TextField
                   name="value"
                   label={LL.DEFAULT(0) + ' ' + LL.VALUE(0)}
                   type="string"
-                  value={editItem.value as string}
+                  value={editItem.value}
                   variant="outlined"
                   onChange={updateFormValue}
                   fullWidth
@@ -237,7 +238,7 @@ const CustomEntitiesDialog = ({
           )}
           {editItem.ram === 0 && (
             <>
-              <Grid mt={3}>
+              <Grid sx={{ mt: 3 }}>
                 <BlockFormControlLabel
                   control={
                     <Checkbox
@@ -259,7 +260,7 @@ const CustomEntitiesDialog = ({
                   margin="normal"
                   sx={{ width: '11ch' }}
                   type="string"
-                  value={editItem.device_id as string}
+                  value={editItem.device_id}
                   onChange={updateFormValue}
                   slotProps={{
                     input: {
@@ -279,7 +280,7 @@ const CustomEntitiesDialog = ({
                   margin="normal"
                   sx={{ width: '11ch' }}
                   type="string"
-                  value={editItem.type_id as string}
+                  value={editItem.type_id}
                   onChange={updateFormValue}
                   slotProps={{
                     input: {
@@ -380,7 +381,7 @@ const CustomEntitiesDialog = ({
                     fieldErrors={fieldErrors || {}}
                     name="factor"
                     label={LL.BITMASK()}
-                    value={editItem.factor as string}
+                    value={editItem.factor}
                     sx={{ width: '11ch' }}
                     variant="outlined"
                     onChange={updateFormValue}
@@ -403,7 +404,7 @@ const CustomEntitiesDialog = ({
       </DialogContent>
       <DialogActions>
         {!creating && (
-          <Box flexGrow={1}>
+          <Box sx={{ flexGrow: 1 }}>
             <Button
               startIcon={<RemoveIcon />}
               variant="outlined"

interface/src/app/main/Customizations.tsx

@@ -111,13 +111,14 @@ const Customizations = () => {
   const [selectedDeviceTypeNameURL, setSelectedDeviceTypeNameURL] =
     useState<string>(''); // needed for API URL
   const [selectedDeviceName, setSelectedDeviceName] = useState<string>('');
+  const [selectedDeviceBrand, setSelectedDeviceBrand] = useState<string>('');
 
   const { send: sendResetCustomizations } = useRequest(resetCustomizations(), {
     immediate: false
   });
 
   const { send: sendDeviceName } = useRequest(
-    (data: { id: number; name: string }) => writeDeviceName(data),
+    (data: { id: number; name: string; brand: string }) => writeDeviceName(data),
     {
       immediate: false
     }
@@ -267,6 +268,7 @@ const Customizations = () => {
         if (device) {
           setSelectedDeviceTypeNameURL(device.url || '');
           setSelectedDeviceName(device.n);
+          setSelectedDeviceBrand(device.b);
         }
         setNumChanges(0);
         setRestartNeeded(false);
@@ -285,13 +287,17 @@ const Customizations = () => {
     return value as string;
   }
 
+  const isCommand = useCallback((de: DeviceEntity) => {
+    return de.n && de.n[0] === '!';
+  }, []);
+
   const formatName = useCallback(
     (de: DeviceEntity, withShortname: boolean) => {
       let name: string;
-      if (de.n && de.n[0] === '!') {
+      if (isCommand(de)) {
         name = de.t
-          ? `${LL.COMMAND(1)}: ${de.t} ${de.n.slice(1)}`
-          : `${LL.COMMAND(1)}: ${de.n.slice(1)}`;
+          ? `${LL.COMMAND(1)}: ${de.t} ${de.n?.slice(1)}`
+          : `${LL.COMMAND(1)}: ${de.n?.slice(1)}`;
       } else if (de.cn && de.cn !== '') {
         name = de.t ? `${de.t} ${de.cn}` : de.cn;
       } else {
@@ -438,7 +444,11 @@ const Customizations = () => {
   }, [devices, deviceEntities, selectedDevice, sendCustomizationEntities, LL]);
 
   const renameDevice = useCallback(async () => {
-    await sendDeviceName({ id: selectedDevice, name: selectedDeviceName })
+    await sendDeviceName({
+      id: selectedDevice,
+      name: selectedDeviceName,
+      brand: selectedDeviceBrand
+    })
       .then(() => {
         toast.success(LL.UPDATED_OF(LL.NAME(1)));
       })
@@ -449,24 +459,42 @@ const Customizations = () => {
         setRename(false);
         await fetchCoreData();
       });
-  }, [selectedDevice, selectedDeviceName, sendDeviceName, LL, fetchCoreData]);
+  }, [
+    selectedDevice,
+    selectedDeviceName,
+    selectedDeviceBrand,
+    sendDeviceName,
+    LL,
+    fetchCoreData
+  ]);
 
   const renderDeviceList = () => (
     <>
-      <Box mb={1} color="warning.main">
-        <Typography variant="body1">{LL.CUSTOMIZATIONS_HELP_1()}.</Typography>
-      </Box>
-      <Box display="flex" flexWrap="wrap" alignItems="center" gap={2}>
+      <Typography sx={{ mb: 1 }} color="warning" variant="body1">
+        {LL.CUSTOMIZATIONS_HELP_1()}.
+      </Typography>
+      <Box sx={{ display: 'flex', flexWrap: 'wrap', alignItems: 'center', gap: 2 }}>
         {rename ? (
-          <TextField
-            name="device"
-            label={LL.EMS_DEVICE()}
-            fullWidth
-            variant="outlined"
-            value={selectedDeviceName}
-            onChange={(e) => setSelectedDeviceName(e.target.value)}
-            margin="normal"
-          />
+          <>
+            <TextField
+              name="device"
+              label={LL.EMS_DEVICE()}
+              style={{ minWidth: '48%' }}
+              variant="outlined"
+              value={selectedDeviceName}
+              onChange={(e) => setSelectedDeviceName(e.target.value)}
+              margin="normal"
+            />
+            <TextField
+              name="brand"
+              label={LL.BRAND()}
+              style={{ minWidth: '48%' }}
+              variant="outlined"
+              value={selectedDeviceBrand}
+              onChange={(e) => setSelectedDeviceBrand(e.target.value)}
+              margin="normal"
+            />
+          </>
         ) : (
           <TextField
             name="device"
@@ -542,27 +570,22 @@ const Customizations = () => {
   const renderDeviceData = () => {
     return (
       <>
-        <Box color="warning.main">
-          <Typography variant="body2" mt={1}>
-            <OptionIcon type="favorite" isSet={true} />={LL.CUSTOMIZATIONS_HELP_2()}
-            &nbsp;&nbsp;
-            <OptionIcon type="readonly" isSet={true} />={LL.CUSTOMIZATIONS_HELP_3()}
-            &nbsp;&nbsp;
-            <OptionIcon type="api_mqtt_exclude" isSet={true} />=
-            {LL.CUSTOMIZATIONS_HELP_4()}&nbsp;&nbsp;
-            <OptionIcon type="web_exclude" isSet={true} />=
-            {LL.CUSTOMIZATIONS_HELP_5()}&nbsp;&nbsp;
-            <OptionIcon type="deleted" isSet={true} />={LL.CUSTOMIZATIONS_HELP_6()}
-          </Typography>
-        </Box>
+        <Typography sx={{ mt: 1, mb: 1 }} color="warning" variant="body2">
+          <OptionIcon type="favorite" isSet={true} />={LL.CUSTOMIZATIONS_HELP_2()}
+          &nbsp;&nbsp;
+          <OptionIcon type="readonly" isSet={true} />={LL.CUSTOMIZATIONS_HELP_3()}
+          &nbsp;&nbsp;
+          <OptionIcon type="api_mqtt_exclude" isSet={true} />=
+          {LL.CUSTOMIZATIONS_HELP_4()}&nbsp;&nbsp;
+          <OptionIcon type="web_exclude" isSet={true} />={LL.CUSTOMIZATIONS_HELP_5()}
+          &nbsp;&nbsp;
+          <OptionIcon type="deleted" isSet={true} />={LL.CUSTOMIZATIONS_HELP_6()}
+        </Typography>
         <Grid
           container
-          mb={1}
-          mt={0}
           spacing={2}
           direction="row"
-          justifyContent="flex-start"
-          alignItems="center"
+          sx={{ mb: 1, mt: 0, justifyContent: 'flex-start', alignItems: 'center' }}
         >
           <Grid>
             <TextField
@@ -666,14 +689,27 @@ const Customizations = () => {
                       <EntityMaskToggle onUpdate={updateDeviceEntity} de={de} />
                     </Cell>
                     <Cell>
-                      {formatName(de, false)}&nbsp;(
-                      <Link
-                        target="_blank"
-                        href={APIURL + selectedDeviceTypeNameURL + '/' + de.id}
+                      <span
+                        style={{
+                          color:
+                            de.v === undefined && !isCommand(de) ? 'grey' : 'inherit'
+                        }}
                       >
-                        {de.id}
-                      </Link>
-                      )
+                        {formatName(de, false)}&nbsp;(
+                        <Link
+                          style={{
+                            color:
+                              de.v === undefined && !isCommand(de)
+                                ? 'grey'
+                                : 'primary'
+                          }}
+                          target="_blank"
+                          href={APIURL + selectedDeviceTypeNameURL + '/' + de.id}
+                        >
+                          {de.id}
+                        </Link>
+                        )
+                      </span>
                     </Cell>
                     <Cell>
                       {!(de.m & DeviceEntityMask.DV_READONLY) && formatValue(de.mi)}
@@ -726,8 +762,9 @@ const Customizations = () => {
       {devices && renderDeviceList()}
       {selectedDevice !== -1 && !rename && renderDeviceData()}
       {restartNeeded ? (
-        <MessageBox my={2} level="warning" message={LL.RESTART_TEXT(0)}>
+        <MessageBox level="warning" message={LL.RESTART_TEXT(0)}>
           <Button
+            sx={{ ml: 2 }}
             startIcon={<PowerSettingsNewIcon />}
             variant="contained"
             color="error"
@@ -737,8 +774,8 @@ const Customizations = () => {
           </Button>
         </MessageBox>
       ) : (
-        <Box display="flex" flexWrap="wrap">
-          <Box flexGrow={1}>
+        <Box sx={{ display: 'flex', flexWrap: 'wrap' }}>
+          <Box sx={{ flexGrow: 1 }}>
             {numChanges !== 0 && (
               <ButtonRow>
                 <Button
@@ -770,10 +807,12 @@ const Customizations = () => {
     </>
   );
 
-  return (
+  return restarting ? (
+    <SystemMonitor />
+  ) : (
     <SectionContent>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
-      {restarting ? <SystemMonitor /> : renderContent()}
+      {renderContent()}
       {selectedDeviceEntity && (
         <SettingsCustomizationsDialog
           open={dialogOpen}

interface/src/app/main/CustomizationsDialog.tsx

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

interface/src/app/main/Dashboard.tsx

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

interface/src/app/main/DeviceIcon.tsx

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

interface/src/app/main/Devices.tsx

@@ -8,7 +8,7 @@ import {
   useState
 } from 'react';
 import { IconContext } from 'react-icons';
-import { useNavigate } from 'react-router';
+import { Link, useNavigate } from 'react-router';
 import { toast } from 'react-toastify';
 
 import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined';
@@ -533,19 +533,27 @@ const Devices = memo(() => {
 
   const renderCoreData = () => (
     <>
-      <Box justifyContent="center" flexDirection="column">
-        <IconContext.Provider
-          value={{
-            color: 'lightblue',
-            size: '18',
-            style: { verticalAlign: 'middle' }
-          }}
-        >
-          {!coreData.connected && (
-            <MessageBox my={2} level="error" message={LL.EMS_BUS_WARNING()} />
-          )}
-
-          {coreData.connected && (
+      {!coreData.connected ? (
+        <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 sx={{ justifyContent: 'center', flexDirection: 'column' }}>
+          <IconContext.Provider
+            value={{
+              color: 'lightblue',
+              size: '18',
+              style: { verticalAlign: 'middle' }
+            }}
+          >
             <Table
               data={{ nodes: [...coreData.devices] }}
               select={device_select}
@@ -581,9 +589,9 @@ const Devices = memo(() => {
                 </>
               )}
             </Table>
-          )}
-        </IconContext.Provider>
-      </Box>
+          </IconContext.Provider>
+        </Box>
+      )}
     </>
   );
 
@@ -662,12 +670,12 @@ const Devices = memo(() => {
         }}
       >
         <Box sx={{ p: 1 }}>
-          <Grid container justifyContent="space-between">
-            <Typography noWrap variant="subtitle1" color="warning.main">
+          <Grid container sx={{ justifyContent: 'space-between' }}>
+            <Typography noWrap variant="subtitle1" color="warning">
               {deviceInfo.n}&nbsp;(
               {deviceInfo.tn})
             </Typography>
-            <Grid justifyContent="flex-end">
+            <Grid sx={{ justifyContent: 'flex-end' }}>
               <ButtonTooltip title={LL.CLOSE()}>
                 <IconButton onClick={resetDeviceSelect} aria-label={LL.CLOSE()}>
                   <HighlightOffIcon color="primary" sx={{ fontSize: 18 }} />

interface/src/app/main/DevicesDialog.tsx

@@ -24,7 +24,7 @@ import type { ValidateFieldsError } from 'async-validator';
 import { ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValue } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 
 import { DeviceValueUOM, DeviceValueUOM_s } from './types';
 import type { DeviceValue } from './types';
@@ -67,7 +67,7 @@ const DevicesDialog = ({
       await validate(validator, editItem);
       onSave(editItem);
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [validator, editItem, onSave]);
 
@@ -128,9 +128,9 @@ const DevicesDialog = ({
     <Dialog sx={dialogStyle} open={open} onClose={onClose}>
       <DialogTitle>{dialogTitle}</DialogTitle>
       <DialogContent dividers>
-        <Box color="warning.main" mb={2}>
-          <Typography variant="body2">{editItem.id.slice(2)}</Typography>
-        </Box>
+        <Typography sx={{ mb: 2 }} color="warning" variant="body2">
+          {editItem.id.slice(2)}
+        </Typography>
         <Grid container>
           <Grid size={12}>
             {editItem.l ? (

interface/src/app/main/Help.tsx

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

interface/src/app/main/Modules.tsx

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

interface/src/app/main/ModulesDialog.tsx

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

interface/src/app/main/OptionIcon.tsx

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

interface/src/app/main/Scheduler.tsx

@@ -41,6 +41,7 @@ const MIN_ID = -100;
 const MAX_ID = 100;
 const ICON_SIZE = 16;
 const SCHEDULE_FLAG_THRESHOLD = 127;
+const FLAG_ALL_DAYS = 127;
 const REFERENCE_YEAR = 2017;
 const REFERENCE_MONTH = '01';
 const LOG_2 = Math.log(2);
@@ -51,7 +52,7 @@ const WEEK_DAYS = [1, 2, 3, 4, 5, 6, 7] as const;
 const DEFAULT_SCHEDULE_ITEM: Omit<ScheduleItem, 'id' | 'o_id'> = {
   active: false,
   deleted: false,
-  flags: ScheduleFlag.SCHEDULE_DAY,
+  flags: FLAG_ALL_DAYS,
   time: '',
   cmd: '',
   value: '',
@@ -357,9 +358,9 @@ const Scheduler = () => {
   return (
     <SectionContent>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
-      <Box mb={2} color="warning.main">
-        <Typography variant="body1">{LL.SCHEDULER_HELP_1()}.</Typography>
-      </Box>
+      <Typography sx={{ mb: 2 }} color="warning" variant="body1">
+        {LL.SCHEDULER_HELP_1()}.
+      </Typography>
       {renderSchedule()}
 
       {selectedScheduleItem && (
@@ -374,8 +375,8 @@ const Scheduler = () => {
         />
       )}
 
-      <Box display="flex" flexWrap="wrap">
-        <Box flexGrow={1}>
+      <Box sx={{ display: 'flex', flexWrap: 'wrap' }}>
+        <Box sx={{ flexGrow: 1 }}>
           {numChanges !== 0 && (
             <ButtonRow>
               <Button
@@ -397,7 +398,7 @@ const Scheduler = () => {
             </ButtonRow>
           )}
         </Box>
-        <Box flexWrap="nowrap" whiteSpace="nowrap">
+        <Box sx={{ flexWrap: 'nowrap', whiteSpace: 'nowrap' }}>
           <ButtonRow>
             <Button
               startIcon={<AddIcon />}

interface/src/app/main/SchedulerDialog.tsx

@@ -4,7 +4,7 @@ import AddIcon from '@mui/icons-material/Add';
 import CancelIcon from '@mui/icons-material/Cancel';
 import DoneIcon from '@mui/icons-material/Done';
 import PlayArrowIcon from '@mui/icons-material/PlayArrow';
-import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
+import RemoveIcon from '@mui/icons-material/RemoveCircleOutlined';
 import {
   Box,
   Button,
@@ -26,14 +26,15 @@ import type { ValidateFieldsError } from 'async-validator';
 import { BlockFormControlLabel, ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { updateValue } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 
 import { ScheduleFlag } from './types';
 import type { ScheduleItem } from './types';
 
 // Constants
 const FLAG_MASK_127 = 127;
-const SCHEDULE_TYPE_THRESHOLD = 128;
+const SCHEDULE_TYPE_THRESHOLD = 127;
+const FLAG_ALL_DAYS = 127;
 const DEFAULT_TIME = '00:00';
 const TYPOGRAPHY_FONT_SIZE = 10;
 
@@ -104,7 +105,7 @@ const SchedulerDialog = ({
       // 130 is on condition
       // 132 is immediate
       setScheduleType(
-        selectedItem.flags < SCHEDULE_TYPE_THRESHOLD
+        selectedItem.flags <= SCHEDULE_TYPE_THRESHOLD
           ? ScheduleFlag.SCHEDULE_DAY
           : selectedItem.flags
       );
@@ -119,7 +120,7 @@ const SchedulerDialog = ({
         await validate(validator, itemToSave);
         onSave(itemToSave);
       } catch (error) {
-        setFieldErrors(error as ValidateFieldsError);
+        setFieldErrors((error as ValidationError).fieldErrors);
       }
     },
     [validator, onSave]
@@ -181,7 +182,7 @@ const SchedulerDialog = ({
         setScheduleType(flag);
         // wipe the time field when changing the schedule type
         // set the flags based on type
-        const newFlags = flag === ScheduleFlag.SCHEDULE_DAY ? 0 : flag;
+        const newFlags = flag === ScheduleFlag.SCHEDULE_DAY ? FLAG_ALL_DAYS : flag;
         setEditItem((prev) => ({ ...prev, time: '', flags: newFlags }));
       }
     },
@@ -190,7 +191,8 @@ const SchedulerDialog = ({
 
   const handleDOWChange = useCallback(
     (_event: React.SyntheticEvent<HTMLElement>, flags: string[]) => {
-      const newFlags = getFlagDOWnumber(flags);
+      const newFlags =
+        getFlagDOWnumber(flags) === 0 ? FLAG_ALL_DAYS : getFlagDOWnumber(flags);
       setEditItem((prev) => ({ ...prev, flags: newFlags }));
     },
     [getFlagDOWnumber]
@@ -336,11 +338,13 @@ const SchedulerDialog = ({
                     onChange={updateFormValue}
                   />
                   {isTimerSchedule && (
-                    <Box color="warning.main" ml={2} mt={4}>
-                      <Typography variant="body2">
-                        {LL.SCHEDULER_HELP_2()}
-                      </Typography>
-                    </Box>
+                    <Typography
+                      sx={{ ml: 2, mt: 4 }}
+                      color="warning"
+                      variant="body2"
+                    >
+                      {LL.SCHEDULER_HELP_2()}
+                    </Typography>
                   )}
                 </>
               ) : (
@@ -389,7 +393,7 @@ const SchedulerDialog = ({
 
       <DialogActions>
         {!creating && (
-          <Box flexGrow={1}>
+          <Box sx={{ flexGrow: 1 }}>
             <Button
               startIcon={<RemoveIcon />}
               variant="outlined"

interface/src/app/main/Sensors.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useContext, useMemo, useState } from 'react';
+import { useCallback, useContext, useMemo, useRef, useState } from 'react';
 import { toast } from 'react-toastify';
 
 import AddCircleOutlineOutlinedIcon from '@mui/icons-material/AddCircleOutlineOutlined';
@@ -54,7 +54,6 @@ const MS_PER_SECOND = 1000;
 const MS_PER_MINUTE = 60 * MS_PER_SECOND;
 const MS_PER_HOUR = 60 * MS_PER_MINUTE;
 const MS_PER_DAY = 24 * MS_PER_HOUR;
-const DEFAULT_GPIO = 99; // not set
 const MIN_TEMP_ID = -100;
 const MAX_TEMP_ID = 100;
 const GPIO_25 = 25;
@@ -128,15 +127,21 @@ const Sensors = () => {
   const [temperatureDialogOpen, setTemperatureDialogOpen] = useState<boolean>(false);
   const [analogDialogOpen, setAnalogDialogOpen] = useState<boolean>(false);
   const [creating, setCreating] = useState<boolean>(false);
+  const firstAvailableGPIO = useRef<number>(undefined);
 
   const { data: sensorData, send: fetchSensorData } = useRequest(readSensorData, {
     initialData: {
       ts: [],
       as: [],
       analog_enabled: false,
-      valid_gpio_list: [],
+      available_gpios: [] as number[],
       platform: 'ESP32'
     }
+  }).onSuccess((event) => {
+    // store the first available GPIO in a ref
+    if (event.data.available_gpios.length > 0) {
+      firstAvailableGPIO.current = event.data.available_gpios[0];
+    }
   });
 
   const { send: sendTemperatureSensor } = useRequest(
@@ -186,10 +191,14 @@ const Sensors = () => {
       sortToggleType: SortToggleType.AlternateWithReset,
       sortFns: {
         GPIO: (array) =>
-          [...array].sort((a, b) => (a as AnalogSensor).g - (b as AnalogSensor).g),
+          [...array].sort(
+            (a, b) => ((a as AnalogSensor)?.g ?? 0) - ((b as AnalogSensor)?.g ?? 0)
+          ),
         NAME: (array) =>
           [...array].sort((a, b) =>
-            (a as AnalogSensor).n.localeCompare((b as AnalogSensor).n)
+            ((a as AnalogSensor)?.n ?? '').localeCompare(
+              (b as AnalogSensor)?.n ?? ''
+            )
           ),
         TYPE: (array) =>
           [...array].sort((a, b) => (a as AnalogSensor).t - (b as AnalogSensor).t),
@@ -338,19 +347,23 @@ const Sensors = () => {
   }, [fetchSensorData]);
 
   const addAnalogSensor = useCallback(() => {
+    if (firstAvailableGPIO.current === undefined) {
+      toast.error(LL.NO_GPIO());
+      return;
+    }
     setCreating(true);
     setSelectedAnalogSensor({
       id: Math.floor(Math.random() * (MAX_TEMP_ID - MIN_TEMP_ID) + MIN_TEMP_ID),
       n: '',
-      g: DEFAULT_GPIO,
-      u: 0,
+      g: firstAvailableGPIO.current,
+      u: DeviceValueUOM.NONE,
       v: 0,
       o: 0,
-      t: 0,
       f: 1,
+      t: AnalogType.DIGITAL_IN, // default to digital in 1
       d: false,
-      o_n: '',
-      s: false
+      s: false,
+      o_n: ''
     });
     setAnalogDialogOpen(true);
   }, []);
@@ -447,23 +460,17 @@ const Sensors = () => {
                   item={as}
                   onClick={() => updateAnalogSensor(as)}
                 >
-                  <Cell stiff>{as.g !== 99 ? as.g : ''}</Cell>
+                  <Cell stiff>{as.g}</Cell>
                   <Cell>{as.n}</Cell>
-                  <Cell stiff>{AnalogTypeNames[as.t]} </Cell>
+                  <Cell stiff>{AnalogTypeNames[as.t - 1]} </Cell>
                   {(as.t === AnalogType.DIGITAL_OUT &&
                     as.g !== GPIO_25 &&
                     as.g !== GPIO_26) ||
                   as.t === AnalogType.DIGITAL_IN ||
                   as.t === AnalogType.PULSE ? (
-                    <Cell stiff>
-                      {as.g !== 99 ? (as.v ? LL.ON() : LL.OFF()) : ''}
-                    </Cell>
+                    <Cell stiff>{as.v ? LL.ON() : LL.OFF()}</Cell>
                   ) : (
-                    <Cell stiff>
-                      {as.t !== AnalogType.NOTUSED && as.g !== 99
-                        ? formatValue(as.v, as.u)
-                        : ''}
-                    </Cell>
+                    <Cell stiff>{formatValue(as.v, as.u)}</Cell>
                   )}
                 </Row>
               ))}
@@ -578,12 +585,20 @@ const Sensors = () => {
           onSave={onAnalogDialogSave}
           creating={creating}
           selectedItem={selectedAnalogSensor}
-          analogGPIOList={sensorData.valid_gpio_list}
+          analogGPIOList={sensorData.available_gpios}
+          disabledTypeList={sensorData.exclude_types}
           validator={analogSensorItemValidation(sensorData.as, selectedAnalogSensor)}
         />
       )}
       {sensorData?.analog_enabled === true && me.admin && (
-        <Box mt={2} display="flex" flexWrap="wrap" justifyContent="flex-end">
+        <Box
+          sx={{
+            mt: 2,
+            display: 'flex',
+            flexWrap: 'wrap',
+            justifyContent: 'flex-end'
+          }}
+        >
           <Button
             variant="outlined"
             color="primary"

interface/src/app/main/SensorsAnalogDialog.tsx

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 
 import CancelIcon from '@mui/icons-material/Cancel';
 import DoneIcon from '@mui/icons-material/Done';
-import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
+import RemoveIcon from '@mui/icons-material/RemoveCircleOutlined';
 import WarningIcon from '@mui/icons-material/Warning';
 import {
   Box,
@@ -23,7 +23,7 @@ import type { ValidateFieldsError } from 'async-validator';
 import { ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValue } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 
 import { AnalogType, AnalogTypeNames, DeviceValueUOM_s } from './types';
 import type { AnalogSensor } from './types';
@@ -35,6 +35,7 @@ interface DashboardSensorsAnalogDialogProps {
   creating: boolean;
   selectedItem: AnalogSensor;
   analogGPIOList: number[];
+  disabledTypeList: number[];
   validator: Schema;
 }
 
@@ -45,6 +46,7 @@ const SensorsAnalogDialog = ({
   creating,
   selectedItem,
   analogGPIOList,
+  disabledTypeList,
   validator
 }: DashboardSensorsAnalogDialogProps) => {
   const { LL } = useI18nContext();
@@ -66,7 +68,16 @@ const SensorsAnalogDialog = ({
 
   // Memoize helper functions to check sensor type conditions
   const isCounterOrRate = useMemo(
-    () => editItem.t >= AnalogType.COUNTER && editItem.t <= AnalogType.RATE,
+    () =>
+      editItem.t === AnalogType.COUNTER ||
+      editItem.t === AnalogType.RATE ||
+      (editItem.t >= AnalogType.CNT_0 && editItem.t <= AnalogType.CNT_2),
+    [editItem.t]
+  );
+  const isCounter = useMemo(
+    () =>
+      editItem.t === AnalogType.COUNTER ||
+      (editItem.t >= AnalogType.CNT_0 && editItem.t <= AnalogType.CNT_2),
     [editItem.t]
   );
   const isFreqType = useMemo(
@@ -80,13 +91,13 @@ const SensorsAnalogDialog = ({
       editItem.t === AnalogType.PWM_2,
     [editItem.t]
   );
-  const isDigitalOutGPIO = useMemo(
+  const isDACOutGPIO = useMemo(
     () =>
       editItem.t === AnalogType.DIGITAL_OUT &&
       (editItem.g === 25 || editItem.g === 26),
     [editItem.t, editItem.g]
   );
-  const isDigitalOutNonGPIO = useMemo(
+  const isDigitalOutGPIO = useMemo(
     () =>
       editItem.t === AnalogType.DIGITAL_OUT &&
       editItem.g !== 25 &&
@@ -97,12 +108,18 @@ const SensorsAnalogDialog = ({
   // Memoize menu items to avoid recreation on each render
   const analogTypeMenuItems = useMemo(
     () =>
-      AnalogTypeNames.map((val, i) => (
-        <MenuItem key={val} value={i}>
-          {val}
-        </MenuItem>
-      )),
-    []
+      AnalogTypeNames.map((val, i) => ({ name: val, value: i + 1 }))
+        .sort((a, b) => a.name.localeCompare(b.name))
+        .map(({ name, value }) => (
+          <MenuItem
+            key={name}
+            value={value}
+            disabled={disabledTypeList?.includes(value)}
+          >
+            {name}
+          </MenuItem>
+        )),
+    [disabledTypeList]
   );
 
   const uomMenuItems = useMemo(
@@ -115,6 +132,23 @@ const SensorsAnalogDialog = ({
     []
   );
 
+  const analogGPIOMenuItems = () =>
+    // add selectedItem.g to the list
+    [
+      ...(analogGPIOList?.includes(selectedItem.g) || selectedItem.g === undefined
+        ? analogGPIOList
+        : [selectedItem.g, ...analogGPIOList])
+    ]
+      .filter((gpio, idx, arr) => arr.indexOf(gpio) === idx)
+      .sort((a, b) => a - b)
+      .map((gpio: number) => {
+        return (
+          <MenuItem key={gpio} value={gpio}>
+            {gpio}
+          </MenuItem>
+        );
+      });
+
   // Reset form when dialog opens or selectedItem changes
   useEffect(() => {
     if (open) {
@@ -138,7 +172,7 @@ const SensorsAnalogDialog = ({
       await validate(validator, editItem);
       onSave(editItem);
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [validator, editItem, onSave]);
 
@@ -152,20 +186,6 @@ const SensorsAnalogDialog = ({
     [creating, LL]
   );
 
-  // Ensure the current GPIO is in the list when no creating
-  // note GPIO 99 means not set
-  const availableGPIOs = useMemo(() => {
-    const filteredList = analogGPIOList.filter((gpio) => gpio !== 99);
-    if (
-      editItem.g !== undefined &&
-      editItem.g !== 99 &&
-      !filteredList.includes(editItem.g)
-    ) {
-      return [...filteredList, editItem.g].sort((a, b) => a - b);
-    }
-    return filteredList;
-  }, [analogGPIOList, editItem.g]);
-
   return (
     <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
       <DialogTitle>{dialogTitle}</DialogTitle>
@@ -175,16 +195,12 @@ const SensorsAnalogDialog = ({
             name="g"
             label="GPIO"
             value={editItem.g}
-            sx={{ width: '8ch' }}
-            disabled={editItem.s}
+            sx={{ width: '9ch' }}
+            disabled={editItem.s || !creating}
             select
             onChange={updateFormValue}
           >
-            {availableGPIOs?.map((gpio: number) => (
-              <MenuItem key={gpio} value={gpio}>
-                {gpio}
-              </MenuItem>
-            ))}
+            {analogGPIOMenuItems()}
           </ValidatedTextField>
           <Grid>
             <ValidatedTextField
@@ -208,7 +224,10 @@ const SensorsAnalogDialog = ({
               {analogTypeMenuItems}
             </ValidatedTextField>
           </Grid>
-          {(isCounterOrRate || isFreqType) && (
+          {(isCounterOrRate ||
+            isFreqType ||
+            editItem.t === AnalogType.ADC ||
+            editItem.t === AnalogType.TIMER) && (
             <Grid>
               <ValidatedTextField
                 name="u"
@@ -223,6 +242,23 @@ const SensorsAnalogDialog = ({
               </ValidatedTextField>
             </Grid>
           )}
+          {editItem.t === AnalogType.DIGITAL_IN && (
+            <Grid>
+              <ValidatedTextField
+                name="f"
+                label={LL.POLARITY()}
+                value={editItem.f}
+                sx={{ width: '15ch' }}
+                fullWidth
+                select
+                onChange={updateFormValue}
+                disabled={editItem.s}
+              >
+                <MenuItem value={1}>{LL.ACTIVEHIGH()}</MenuItem>
+                <MenuItem value={0}>{LL.ACTIVELOW()}</MenuItem>
+              </ValidatedTextField>
+            </Grid>
+          )}
           {editItem.t === AnalogType.ADC && (
             <Grid>
               <ValidatedTextField
@@ -265,7 +301,7 @@ const SensorsAnalogDialog = ({
               />
             </Grid>
           )}
-          {editItem.t === AnalogType.COUNTER && (
+          {isCounter && (
             <Grid>
               <ValidatedTextField
                 name="o"
@@ -294,7 +330,10 @@ const SensorsAnalogDialog = ({
               />
             </Grid>
           )}
-          {isCounterOrRate && (
+          {(isCounterOrRate ||
+            isFreqType ||
+            editItem.t === AnalogType.ADC ||
+            editItem.t === AnalogType.TIMER) && (
             <Grid>
               <ValidatedTextField
                 name="f"
@@ -310,7 +349,7 @@ const SensorsAnalogDialog = ({
               />
             </Grid>
           )}
-          {isDigitalOutGPIO && (
+          {isDACOutGPIO && (
             <Grid>
               <ValidatedTextField
                 name="o"
@@ -326,7 +365,7 @@ const SensorsAnalogDialog = ({
               />
             </Grid>
           )}
-          {isDigitalOutNonGPIO && (
+          {isDigitalOutGPIO && (
             <>
               <Grid>
                 <ValidatedTextField
@@ -425,7 +464,7 @@ const SensorsAnalogDialog = ({
                   name="o"
                   label={LL.POLARITY()}
                   value={editItem.o}
-                  sx={{ width: '11ch' }}
+                  sx={{ width: '15ch' }}
                   select
                   onChange={updateFormValue}
                   disabled={editItem.s}
@@ -457,7 +496,7 @@ const SensorsAnalogDialog = ({
           )}
         </Grid>
         {fieldErrors && Object.keys(fieldErrors).length > 0 && (
-          <Box mt={1}>
+          <Box sx={{ mt: 1 }}>
             {Object.values(fieldErrors).map((errArr, idx) =>
               Array.isArray(errArr)
                 ? errArr.map((err, j) => (
@@ -465,7 +504,7 @@ const SensorsAnalogDialog = ({
                       key={`${idx}-${j}`}
                       color="error"
                       variant="caption"
-                      display="block"
+                      sx={{ display: 'block' }}
                     >
                       {err.message}
                     </Typography>
@@ -476,7 +515,7 @@ const SensorsAnalogDialog = ({
         )}
         {editItem.s && (
           <Grid>
-            <Typography mt={1} color="warning.main" variant="body2">
+            <Typography sx={{ mt: 1 }} color="warning" variant="body2">
               <WarningIcon
                 fontSize="small"
                 sx={{ mr: 1, verticalAlign: 'middle' }}
@@ -489,7 +528,7 @@ const SensorsAnalogDialog = ({
       </DialogContent>
       <DialogActions>
         {!creating && (
-          <Box flexGrow={1} sx={{ '& button': { mt: 0 } }}>
+          <Box sx={{ flexGrow: 1, '& button': { mt: 0 } }}>
             <Button
               startIcon={<RemoveIcon />}
               disabled={editItem.s}

interface/src/app/main/SensorsTemperatureDialog.tsx

@@ -4,7 +4,6 @@ import CancelIcon from '@mui/icons-material/Cancel';
 import DoneIcon from '@mui/icons-material/Done';
 import WarningIcon from '@mui/icons-material/Warning';
 import {
-  Box,
   Button,
   Dialog,
   DialogActions,
@@ -22,7 +21,7 @@ import type { ValidateFieldsError } from 'async-validator';
 import { ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValue } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 
 import type { TemperatureSensor } from './types';
 
@@ -85,7 +84,7 @@ const SensorsTemperatureDialog = ({
       await validate(validator, editItem);
       onSave(editItem);
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [validator, editItem, onSave]);
 
@@ -111,11 +110,9 @@ const SensorsTemperatureDialog = ({
     <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
       <DialogTitle>{dialogTitle}</DialogTitle>
       <DialogContent dividers>
-        <Box color="warning.main" mb={2}>
-          <Typography variant="body2">
-            {LL.ID_OF(LL.SENSOR(0))}: {editItem.id}
-          </Typography>
-        </Box>
+        <Typography sx={{ mb: 2 }} color="warning" variant="body2">
+          {LL.ID_OF(LL.SENSOR(0))}: {editItem.id}
+        </Typography>
         <Grid container spacing={2}>
           <Grid>
             <ValidatedTextField
@@ -142,7 +139,7 @@ const SensorsTemperatureDialog = ({
         </Grid>
         {editItem.s && (
           <Grid>
-            <Typography mt={1} color="warning.main" variant="body2">
+            <Typography sx={{ mt: 1 }} color="warning" variant="body2">
               <WarningIcon
                 fontSize="small"
                 sx={{ mr: 1, verticalAlign: 'middle' }}

interface/src/app/main/UserProfile.tsx

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

interface/src/app/main/types.ts

@@ -89,15 +89,15 @@ export interface TemperatureSensor {
 export interface AnalogSensor {
   id: number;
   g: number; // GPIO
-  n: string;
-  v: number;
-  u: number;
-  o: number;
-  f: number;
-  t: number;
+  n: string; // name
+  v: number; // value
+  u: number; // uom
+  o: number; // offset
+  f: number; // factor
+  t: number; // type
   d: boolean; // deleted flag
   s: boolean; // system sensor flag
-  o_n?: string;
+  o_n?: string; // original name
 }
 
 export interface WriteTemperatureSensor {
@@ -111,7 +111,8 @@ export interface SensorData {
   ts: TemperatureSensor[];
   as: AnalogSensor[];
   analog_enabled: boolean;
-  valid_gpio_list: number[];
+  available_gpios: number[];
+  exclude_types: number[];
   platform: string;
 }
 
@@ -195,13 +196,13 @@ export enum DeviceValueUOM {
   MBAR,
   LH,
   CTKWH,
-  HZ
+  HERTZ
 }
 
 export const DeviceValueUOM_s = [
   '',
   '°C',
-  '°C',
+  '°C Rel',
   '%',
   'l/min',
   'kWh',
@@ -231,7 +232,6 @@ export const DeviceValueUOM_s = [
 
 export enum AnalogType {
   REMOVED = -1,
-  NOTUSED = 0,
   DIGITAL_IN = 1,
   COUNTER = 2,
   ADC = 3,
@@ -246,26 +246,31 @@ export enum AnalogType {
   PULSE = 12,
   FREQ_0 = 13,
   FREQ_1 = 14,
-  FREQ_2 = 15
+  FREQ_2 = 15,
+  CNT_0 = 16,
+  CNT_1 = 17,
+  CNT_2 = 18
 }
 
 export const AnalogTypeNames = [
-  '(disabled)',
-  'Digital In',
-  'Counter',
-  'ADC In',
-  'Timer',
-  'Rate',
-  'Digital Out',
-  'PWM 0',
-  'PWM 1',
-  'PWM 2',
-  'NTC Temp.',
-  'RGB Led',
-  'Pulse',
-  'Freq 0',
-  'Freq 1',
-  'Freq 2'
+  'Digital In', // 1
+  'Counter', // 2
+  'ADC In', // 3
+  'Timer', // 4
+  'Rate', // 5
+  'Digital Out', // 6
+  'PWM 0', // 7
+  'PWM 1', // 8
+  'PWM 2', // 9
+  'NTC Temp', // 10
+  'RGB Led', // 11
+  'Pulse', // 12
+  'Freq 0', // 13
+  'Freq 1', // 14
+  'Freq 2', // 15
+  'Counter 0', // 16
+  'Counter 1', // 17
+  'Counter 2' // 18
 ] as const;
 
 export const BOARD_PROFILES = {

interface/src/app/main/validators.ts

@@ -310,14 +310,6 @@ export const analogSensorItemValidation = (
       { required: true, message: 'Name is required' },
       NAME_PATTERN,
       uniqueAnalogNameValidator(sensors, sensor.o_n)
-    ],
-    g: [
-      {
-        required: true,
-        type: 'number',
-        min: 1,
-        message: 'GPIO is required'
-      }
     ]
   });
 };

interface/src/app/settings/APSettings.tsx

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

interface/src/app/settings/ApplicationSettings.tsx

@@ -33,7 +33,7 @@ import {
 } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValueDirty, useRest } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 
 import { API, getBoardProfile, readSettings, writeSettings } from '../../api/app';
 import { BOARD_PROFILES } from '../main/types';
@@ -153,7 +153,7 @@ const ApplicationSettings = () => {
       setFieldErrors(undefined);
       await validate(createSettingsValidator(data), data);
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     } finally {
       await saveData();
     }
@@ -328,9 +328,9 @@ const ApplicationSettings = () => {
               >
                 <MenuItem value={-1}>OFF</MenuItem>
                 <MenuItem value={3}>ERR</MenuItem>
+                <MenuItem value={4}>WARN</MenuItem>
                 <MenuItem value={5}>NOTICE</MenuItem>
                 <MenuItem value={6}>INFO</MenuItem>
-                <MenuItem value={7}>DEBUG</MenuItem>
                 <MenuItem value={9}>ALL</MenuItem>
               </TextField>
             </Grid>
@@ -489,17 +489,25 @@ const ApplicationSettings = () => {
           name="board_profile"
           label={LL.BOARD_PROFILE()}
           value={data.board_profile}
-          disabled={processingBoard || hardwareData.model.startsWith('BBQKees')}
+          disabled={processingBoard}
           variant="outlined"
           onChange={changeBoardProfile}
           margin="normal"
           select
         >
-          {boardProfileItems}
-          <Divider />
-          <MenuItem key={'CUSTOM'} value={'CUSTOM'}>
-            {LL.CUSTOM()}&hellip;
-          </MenuItem>
+          {hardwareData.model.startsWith('BBQKees') ? (
+            <MenuItem key={hardwareData.board} value={hardwareData.board}>
+              {BOARD_PROFILES[hardwareData.board as BoardProfileKey]}
+            </MenuItem>
+          ) : (
+            boardProfileItems
+          )}
+          {(data.board_profile === 'CUSTOM' || data.developer_mode) && <Divider />}
+          {(data.board_profile === 'CUSTOM' || data.developer_mode) && (
+            <MenuItem key={'CUSTOM'} value={'CUSTOM'}>
+              {LL.CUSTOM()}&hellip;
+            </MenuItem>
+          )}
         </TextField>
         {data.board_profile === 'CUSTOM' && (
           <>
@@ -602,6 +610,7 @@ const ApplicationSettings = () => {
                   <MenuItem value={0}>{LL.DISABLED(1)}</MenuItem>
                   <MenuItem value={1}>LAN8720</MenuItem>
                   <MenuItem value={2}>TLK110</MenuItem>
+                  <MenuItem value={3}>RTL8201</MenuItem>
                 </TextField>
               </Grid>
             </Grid>
@@ -668,6 +677,7 @@ const ApplicationSettings = () => {
               <MenuItem value={2}>EMS+</MenuItem>
               <MenuItem value={3}>HT3</MenuItem>
               <MenuItem value={4}>{LL.HARDWARE()}</MenuItem>
+              <MenuItem value={5}>Auto</MenuItem>
             </TextField>
           </Grid>
           <Grid>
@@ -762,7 +772,7 @@ const ApplicationSettings = () => {
           label={LL.REMOTE_TIMEOUT_EN()}
         />
         {data.remote_timeout_en && (
-          <Box mt={2}>
+          <Box sx={{ mt: 2 }}>
             <ValidatedTextField
               fieldErrors={fieldErrors || {}}
               name="remote_timeout"
@@ -857,8 +867,9 @@ const ApplicationSettings = () => {
         </Grid>
 
         {restartNeeded && (
-          <MessageBox my={2} level="warning" message={LL.RESTART_TEXT(0)}>
+          <MessageBox level="warning" message={LL.RESTART_TEXT(0)}>
             <Button
+              sx={{ ml: 2 }}
               startIcon={<PowerSettingsNewIcon />}
               variant="contained"
               color="error"
@@ -894,10 +905,12 @@ const ApplicationSettings = () => {
     );
   };
 
-  return (
+  return restarting ? (
+    <SystemMonitor />
+  ) : (
     <SectionContent>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
-      {restarting ? <SystemMonitor /> : content()}
+      {content()}
     </SectionContent>
   );
 };

interface/src/app/settings/DownloadUpload.tsx

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

interface/src/app/settings/MqttSettings.tsx

@@ -31,7 +31,7 @@ import {
 import { useI18nContext } from 'i18n/i18n-react';
 import type { MqttSettingsType } from 'types';
 import { numberValue, updateValueDirty, useRest } from 'utils';
-import { createMqttSettingsValidator, validate } from 'validators';
+import { ValidationError, createMqttSettingsValidator, validate } from 'validators';
 
 import { callAction } from '../../api/app';
 
@@ -94,7 +94,7 @@ const MqttSettings = () => {
       await validate(createMqttSettingsValidator(data), data);
       await saveData();
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [data, saveData]);
 
@@ -129,7 +129,7 @@ const MqttSettings = () => {
     <SectionContent>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       <>
-        <Box display="flex" gap={2} mb={1}>
+        <Box sx={{ display: 'flex', gap: 2, mb: 1 }}>
           <BlockFormControlLabel
             control={
               <Checkbox
@@ -266,6 +266,7 @@ const MqttSettings = () => {
             label={LL.CERT()}
             variant="outlined"
             value={data.rootCA}
+            sx={{ width: '50ch' }}
             onChange={updateFormValue}
             margin="normal"
           />
@@ -344,75 +345,91 @@ const MqttSettings = () => {
             </Grid>
           )}
         </Grid>
-        <Grid container spacing={2} rowSpacing={0}>
-          <Grid>
-            <BlockFormControlLabel
-              control={
-                <Checkbox
-                  name="ha_enabled"
-                  checked={data.ha_enabled}
-                  onChange={updateFormValue}
-                  disabled={data.publish_single}
-                />
-              }
-              label={LL.MQTT_PUBLISH_TEXT_3()}
-            />
-          </Grid>
-          {data.ha_enabled && (
-            <Grid container spacing={2} rowSpacing={0}>
-              <Grid>
-                <TextField
-                  name="discovery_type"
-                  label={LL.MQTT_PUBLISH_TEXT_5()}
-                  value={data.discovery_type}
-                  variant="outlined"
-                  onChange={updateFormValue}
-                  margin="normal"
-                  select
-                >
-                  <MenuItem value={0}>Home Assistant</MenuItem>
-                  <MenuItem value={1}>Domoticz</MenuItem>
-                  <MenuItem value={2}>Domoticz (latest)</MenuItem>
-                </TextField>
-              </Grid>
-              <Grid>
-                <TextField
-                  name="discovery_prefix"
-                  label={LL.MQTT_PUBLISH_TEXT_4()}
-                  variant="outlined"
-                  value={data.discovery_prefix}
-                  onChange={updateFormValue}
-                  margin="normal"
-                />
-              </Grid>
-              <Grid>
-                <TextField
-                  name="entity_format"
-                  label={LL.MQTT_ENTITY_FORMAT()}
-                  value={data.entity_format}
-                  variant="outlined"
-                  onChange={updateFormValue}
-                  margin="normal"
-                  select
-                >
-                  <MenuItem value={0}>{LL.MQTT_ENTITY_FORMAT_0()}</MenuItem>
-                  <MenuItem value={3}>
-                    {LL.MQTT_ENTITY_FORMAT_1()}&nbsp;(v3.5)
-                  </MenuItem>
-                  <MenuItem value={4}>
-                    {LL.MQTT_ENTITY_FORMAT_2()}&nbsp;(v3.5)
-                  </MenuItem>
-                  <MenuItem value={1}>
-                    {LL.MQTT_ENTITY_FORMAT_1()}&nbsp;(latest)
-                  </MenuItem>
-                  <MenuItem value={2}>
-                    {LL.MQTT_ENTITY_FORMAT_2()}&nbsp;(latest)
-                  </MenuItem>
-                </TextField>
-              </Grid>
-            </Grid>
-          )}
+        {/* <Grid container spacing={2} rowSpacing={0}> */}
+        <Grid>
+          <BlockFormControlLabel
+            control={
+              <Checkbox
+                name="ha_enabled"
+                checked={data.ha_enabled}
+                onChange={updateFormValue}
+                disabled={data.publish_single}
+              />
+            }
+            label={LL.MQTT_PUBLISH_TEXT_3()}
+          />
         </Grid>
+        {data.ha_enabled && (
+          <Grid container spacing={2} rowSpacing={0}>
+            <Grid>
+              <TextField
+                name="discovery_type"
+                label={LL.MQTT_PUBLISH_TEXT_5()}
+                value={data.discovery_type}
+                variant="outlined"
+                onChange={updateFormValue}
+                margin="normal"
+                select
+              >
+                <MenuItem value={0}>Home Assistant</MenuItem>
+                <MenuItem value={1}>Domoticz</MenuItem>
+                <MenuItem value={2}>Domoticz (latest)</MenuItem>
+              </TextField>
+            </Grid>
+            <Grid>
+              <TextField
+                name="discovery_prefix"
+                label={LL.MQTT_PUBLISH_TEXT_4()}
+                variant="outlined"
+                value={data.discovery_prefix}
+                onChange={updateFormValue}
+                margin="normal"
+              />
+            </Grid>
+            <Grid>
+              <TextField
+                name="entity_format"
+                label={LL.MQTT_ENTITY_FORMAT()}
+                value={data.entity_format}
+                variant="outlined"
+                onChange={updateFormValue}
+                margin="normal"
+                select
+              >
+                <MenuItem value={0}>{LL.MQTT_ENTITY_FORMAT_0()}</MenuItem>
+                <MenuItem value={3}>
+                  {LL.MQTT_ENTITY_FORMAT_1()}&nbsp;(v3.5)
+                </MenuItem>
+                <MenuItem value={4}>
+                  {LL.MQTT_ENTITY_FORMAT_2()}&nbsp;(v3.5)
+                </MenuItem>
+                <MenuItem value={1}>
+                  {LL.MQTT_ENTITY_FORMAT_1()}&nbsp;(latest)
+                </MenuItem>
+                <MenuItem value={2}>
+                  {LL.MQTT_ENTITY_FORMAT_2()}&nbsp;(latest)
+                </MenuItem>
+              </TextField>
+            </Grid>
+            <Grid>
+              {data.discovery_type === 0 && (
+                <TextField
+                  name="ha_number_mode"
+                  label={LL.MQTT_INPUT_NUMBER_FORMAT()}
+                  value={data.ha_number_mode}
+                  variant="outlined"
+                  onChange={updateFormValue}
+                  sx={{ width: '20ch' }}
+                  margin="normal"
+                  select
+                >
+                  <MenuItem value={0}>Box</MenuItem>
+                  <MenuItem value={1}>Slider</MenuItem>
+                </TextField>
+              )}
+            </Grid>
+          </Grid>
+        )}
         <Typography sx={{ pt: 2 }} variant="h6" color="primary">
           {LL.MQTT_PUBLISH_INTERVALS()}&nbsp;(0=auto)
         </Typography>

interface/src/app/settings/NTPSettings.tsx

@@ -36,7 +36,7 @@ import {
 import { useI18nContext } from 'i18n/i18n-react';
 import type { NTPSettingsType, Time } from 'types';
 import { formatLocalDateTime, updateValueDirty, useRest } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 import { NTP_SETTINGS_VALIDATOR } from 'validators/ntp';
 
 import { TIME_ZONES, selectedTimeZone, useTimeZoneSelectItems } from './TZ';
@@ -133,7 +133,7 @@ const NTPSettings = () => {
       await validate(NTP_SETTINGS_VALIDATOR, data);
       await saveData();
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
   }, [data, saveData]);
 
@@ -193,9 +193,9 @@ const NTPSettings = () => {
           {timeZoneItems}
         </ValidatedTextField>
 
-        <Box display="flex" flexWrap="wrap">
+        <Box sx={{ display: 'flex', flexWrap: 'wrap' }}>
           {!data.enabled && !dirtyFlags.length && (
-            <Box flexWrap="nowrap" whiteSpace="nowrap">
+            <Box sx={{ flexWrap: 'nowrap', whiteSpace: 'nowrap' }}>
               <ButtonRow>
                 <Button
                   onClick={openSetTime}
@@ -259,9 +259,9 @@ const NTPSettings = () => {
       <Dialog sx={dialogStyle} open={settingTime} onClose={handleCloseSetTime}>
         <DialogTitle>{LL.SET_TIME(1)}</DialogTitle>
         <DialogContent dividers>
-          <Box color="warning.main" p={0} pl={0} pr={0} mt={0} mb={2}>
-            <Typography variant="body2">{LL.SET_TIME_TEXT()}</Typography>
-          </Box>
+          <Typography color="warning" variant="body2">
+            {LL.SET_TIME_TEXT()}
+          </Typography>
           <TextField
             label={LL.LOCAL_TIME(0)}
             type="datetime-local"

interface/src/app/settings/Settings.tsx

@@ -156,11 +156,13 @@ const Settings = () => {
         <Divider />
 
         <Box
-          mt={2}
-          display="flex"
-          justifyContent="flex-end"
-          flexWrap="nowrap"
-          whiteSpace="nowrap"
+          sx={{
+            mt: 2,
+            display: 'flex',
+            justifyContent: 'flex-end',
+            flexWrap: 'nowrap',
+            whiteSpace: 'nowrap'
+          }}
         >
           <Button
             startIcon={<SettingsBackupRestoreIcon />}
@@ -182,7 +184,7 @@ const Settings = () => {
     restarting
   ]);
 
-  return <SectionContent>{restarting ? <SystemMonitor /> : content}</SectionContent>;
+  return restarting ? <SystemMonitor /> : <SectionContent>{content}</SectionContent>;
 };
 
 export default Settings;

interface/src/app/settings/TZ.tsx

@@ -2,9 +2,7 @@ import { useMemo } from 'react';
 
 import { MenuItem } from '@mui/material';
 
-type TimeZones = Record<string, string>;
-
-export const TIME_ZONES: Readonly<TimeZones> = {
+export const TIME_ZONES: Record<string, string> = {
   'Africa/Abidjan': 'GMT0',
   'Africa/Accra': 'GMT0',
   'Africa/Addis_Ababa': 'EAT-3',

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

@@ -40,7 +40,7 @@ import {
 import { useI18nContext } from 'i18n/i18n-react';
 import type { NetworkSettingsType } from 'types';
 import { updateValueDirty, useRest } from 'utils';
-import { validate } from 'validators';
+import { ValidationError, validate } from 'validators';
 import { createNetworkSettingsValidator } from 'validators/network';
 
 import SystemMonitor from '../../status/SystemMonitor';
@@ -116,7 +116,7 @@ const NetworkSettings = () => {
       await validate(createNetworkSettingsValidator(data), data);
       await saveData();
     } catch (error) {
-      setFieldErrors(error as ValidateFieldsError);
+      setFieldErrors((error as ValidationError).fieldErrors);
     }
     deselectNetwork();
   }, [data, saveData, deselectNetwork]);
@@ -355,8 +355,9 @@ const NetworkSettings = () => {
           </>
         )}
         {restartNeeded && (
-          <MessageBox my={2} level="warning" message={LL.RESTART_TEXT(0)}>
+          <MessageBox level="warning" message={LL.RESTART_TEXT(0)}>
             <Button
+              sx={{ ml: 2 }}
               startIcon={<PowerSettingsNewIcon />}
               variant="contained"
               color="error"
@@ -396,10 +397,12 @@ const NetworkSettings = () => {
     );
   };
 
-  return (
+  return restarting ? (
+    <SystemMonitor />
+  ) : (
     <SectionContent>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
-      {restarting ? <SystemMonitor /> : content()}
+      {content()}
     </SectionContent>
   );
 };

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

@@ -94,7 +94,7 @@ const WiFiNetworkSelector = ({ networkList }: { networkList: WiFiNetworkList })
   );
 
   if (networkList.networks.length === 0) {
-    return <MessageBox mt={2} mb={1} message={LL.NETWORK_NO_WIFI()} level="info" />;
+    return <MessageBox message={LL.NETWORK_NO_WIFI()} level="info" />;
   }
 
   return <List>{networkList.networks.map(renderNetwork)}</List>;

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

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

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

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

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

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

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

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

interface/src/app/status/Status.tsx

@@ -8,10 +8,10 @@ import DeviceHubIcon from '@mui/icons-material/DeviceHub';
 import DirectionsBusIcon from '@mui/icons-material/DirectionsBus';
 import LogoDevIcon from '@mui/icons-material/LogoDev';
 import MemoryIcon from '@mui/icons-material/Memory';
+import MonitorHeartIcon from '@mui/icons-material/MonitorHeart';
 import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
 import RouterIcon from '@mui/icons-material/Router';
 import SettingsInputAntennaIcon from '@mui/icons-material/SettingsInputAntenna';
-import TimerIcon from '@mui/icons-material/Timer';
 import WifiIcon from '@mui/icons-material/Wifi';
 import {
   Avatar,
@@ -37,7 +37,7 @@ import { FormLoader, SectionContent, useLayoutTitle } from 'components';
 import ListMenuItem from 'components/layout/ListMenuItem';
 import { AuthenticatedContext } from 'contexts/authentication';
 import { useI18nContext } from 'i18n/i18n-react';
-import { NTPSyncStatus, NetworkConnectionStatus } from 'types';
+import { NTPSyncStatus, NetworkConnectionStatus, SystemStatusCodes } from 'types';
 import { useInterval } from 'utils';
 import { formatDateTime } from 'utils/time';
 
@@ -113,6 +113,27 @@ const SystemStatus = () => {
     }
   }, [data?.bus_status, data?.bus_uptime, LL]);
 
+  // Memoize derived status values to avoid recalculation on every render
+  const systemStatus = useMemo(() => {
+    if (!data) return '??';
+
+    switch (data.status) {
+      case SystemStatusCodes.SYSTEM_STATUS_PENDING_UPLOAD:
+      case SystemStatusCodes.SYSTEM_STATUS_UPLOADING:
+        return LL.WAIT_FIRMWARE();
+      case SystemStatusCodes.SYSTEM_STATUS_ERROR_UPLOAD:
+        return LL.ERROR();
+      case SystemStatusCodes.SYSTEM_STATUS_PENDING_RESTART:
+      case SystemStatusCodes.SYSTEM_STATUS_RESTART_REQUESTED:
+        return LL.RESTARTING_PRE();
+      case SystemStatusCodes.SYSTEM_STATUS_INVALID_GPIO:
+        return LL.GPIO_OF(LL.FAILED(0));
+      default:
+        // SystemStatusCodes.SYSTEM_STATUS_NORMAL
+        return 'OK';
+    }
+  }, [data?.status, LL]);
+
   const busStatusHighlight = useMemo(() => {
     if (!data) return theme.palette.warning.main;
 
@@ -313,10 +334,13 @@ const SystemStatus = () => {
           <ListItem>
             <ListItemAvatar>
               <Avatar sx={{ bgcolor: '#c5572c', color: 'white' }}>
-                <TimerIcon />
+                <MonitorHeartIcon />
               </Avatar>
             </ListItemAvatar>
-            <ListItemText primary={LL.UPTIME()} secondary={uptimeText} />
+            <ListItemText
+              primary={LL.STATUS_OF(LL.SYSTEM(0))}
+              secondary={`${systemStatus} (${LL.UPTIME()}: ${uptimeText})`}
+            />
             {me.admin && (
               <Button
                 startIcon={<PowerSettingsNewIcon />}
@@ -419,7 +443,7 @@ const SystemStatus = () => {
     renderRestartDialog
   ]);
 
-  return <SectionContent>{restarting ? <SystemMonitor /> : content}</SectionContent>;
+  return restarting ? <SystemMonitor /> : <SectionContent>{content}</SectionContent>;
 };
 
 export default SystemStatus;

interface/src/app/status/SystemLog.tsx

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

interface/src/app/status/SystemMonitor.tsx

@@ -60,18 +60,16 @@ const SystemMonitor = () => {
   const { statusMessage, isUploading, progressValue } = useMemo(() => {
     const status = data?.status;
 
-    let message = '';
-    if (status && status >= SystemStatusCodes.SYSTEM_STATUS_UPLOADING) {
-      message = LL.WAIT_FIRMWARE();
-    } else if (status === SystemStatusCodes.SYSTEM_STATUS_PENDING_RESTART) {
-      message = LL.APPLICATION_RESTARTING();
-    } else if (status === SystemStatusCodes.SYSTEM_STATUS_NORMAL) {
-      message = LL.RESTARTING_PRE();
-    } else if (status === SystemStatusCodes.SYSTEM_STATUS_ERROR_UPLOAD) {
-      message = 'Upload Failed';
-    } else {
-      message = LL.RESTARTING_POST();
-    }
+    const message =
+      status && status >= SystemStatusCodes.SYSTEM_STATUS_UPLOADING
+        ? LL.WAIT_FIRMWARE()
+        : status === SystemStatusCodes.SYSTEM_STATUS_PENDING_RESTART
+          ? LL.APPLICATION_RESTARTING()
+          : status === SystemStatusCodes.SYSTEM_STATUS_NORMAL
+            ? LL.RESTARTING_PRE()
+            : status === SystemStatusCodes.SYSTEM_STATUS_ERROR_UPLOAD
+              ? 'Upload Failed'
+              : LL.RESTARTING_POST();
 
     const uploading =
       status !== undefined && status >= SystemStatusCodes.SYSTEM_STATUS_UPLOADING;
@@ -103,8 +101,8 @@ const SystemMonitor = () => {
         height: '100vh',
         display: 'flex',
         alignItems: 'center',
-        justifyContent: 'center',
-        backdropFilter: 'blur(8px)'
+        justifyContent: 'center'
+        // backdropFilter: 'blur(8px)'
       }}
     >
       <Box
@@ -113,33 +111,31 @@ const SystemMonitor = () => {
           minWidth: '300px',
           maxWidth: '500px',
           backgroundColor: '#393939',
-          border: 3,
+          border: 2,
           borderColor: '#565656',
           borderRadius: '8px',
           boxShadow: '0 8px 32px rgba(0, 0, 0, 0.3)',
           p: 3
         }}
       >
-        <Box display="flex" alignItems="center" flexDirection="column">
+        <Box sx={{ display: 'flex', alignItems: 'center', flexDirection: 'column' }}>
           <img
             src="/app/icon.png"
             alt="EMS-ESP"
             style={{ width: '40px', height: '40px', marginBottom: '16px' }}
           />
           <Typography
-            color="secondary"
+            sx={{ color: 'secondary', fontWeight: 400, textAlign: 'center' }}
             variant="h6"
-            fontWeight={400}
-            textAlign="center"
           >
             {statusMessage}
           </Typography>
 
           {errorMessage ? (
-            <MessageBox my={2} level="error" message={errorMessage}>
+            <MessageBox level="error" message={errorMessage}>
               <Button
-                size="small"
                 sx={{ ml: 2 }}
+                size="small"
                 startIcon={<CancelIcon />}
                 variant="contained"
                 color="error"
@@ -150,11 +146,14 @@ const SystemMonitor = () => {
             </MessageBox>
           ) : (
             <>
-              <Typography mt={2} variant="h6" fontWeight={400} textAlign="center">
+              <Typography
+                sx={{ mt: 2, fontWeight: 400, textAlign: 'center' }}
+                variant="h6"
+              >
                 {LL.PLEASE_WAIT()}&hellip;
               </Typography>
               {isUploading && (
-                <Box width="100%" pl={2} pr={2} py={2}>
+                <Box sx={{ width: '100%', pl: 2, pr: 2, py: 2 }}>
                   <LinearProgressWithLabel value={progressValue} />
                 </Box>
               )}

interface/src/app/status/Version.tsx

@@ -1,4 +1,13 @@
-import { memo, useCallback, useContext, useEffect, useMemo, useState } from 'react';
+import {
+  memo,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState
+} from 'react';
+import { Link } from 'react-router';
 import { toast } from 'react-toastify';
 
 import CancelIcon from '@mui/icons-material/Cancel';
@@ -10,15 +19,12 @@ import WarningIcon from '@mui/icons-material/Warning';
 import {
   Box,
   Button,
-  Checkbox,
   Dialog,
   DialogActions,
   DialogContent,
   DialogTitle,
-  FormControlLabel,
   Grid,
   IconButton,
-  Link,
   Table,
   TableBody,
   TableCell,
@@ -54,6 +60,13 @@ const DEV_RELNOTES_URL =
   'https://github.com/emsesp/EMS-ESP32/blob/dev/CHANGELOG_LATEST.md';
 
 // Types for better type safety
+interface PartitionData {
+  partition: string;
+  version: string;
+  install_date?: string;
+  size: number;
+}
+
 interface VersionData {
   emsesp_version: string;
   arduino_version: string;
@@ -61,6 +74,9 @@ interface VersionData {
   flash_chip_size: number;
   psram: boolean;
   build_flags?: string;
+  partition: string;
+  partitions: PartitionData[];
+  developer_mode: boolean;
 }
 
 interface UpgradeCheckData {
@@ -80,6 +96,10 @@ const VersionInfoDialog = memo(
     showVersionInfo,
     latestVersion,
     latestDevVersion,
+    partitionVersion,
+    partition,
+    currentPartition,
+    size,
     locale,
     LL,
     onClose
@@ -87,6 +107,10 @@ const VersionInfoDialog = memo(
     showVersionInfo: number;
     latestVersion?: VersionInfo;
     latestDevVersion?: VersionInfo;
+    partitionVersion?: VersionInfo | undefined;
+    partition: string;
+    currentPartition: string;
+    size: number;
     locale: string;
     LL: TranslationFunctions;
     onClose: () => void;
@@ -94,8 +118,19 @@ const VersionInfoDialog = memo(
     if (showVersionInfo === 0) return null;
 
     const isStable = showVersionInfo === 1;
-    const version = isStable ? latestVersion : latestDevVersion;
-    const relNotesUrl = isStable ? STABLE_RELNOTES_URL : DEV_RELNOTES_URL;
+    const isDev = showVersionInfo === 2;
+    const isPartition = showVersionInfo === 3;
+
+    const version = isStable
+      ? latestVersion
+      : isDev
+        ? latestDevVersion
+        : partitionVersion;
+    const relNotesUrl = isStable
+      ? STABLE_RELNOTES_URL
+      : isDev
+        ? DEV_RELNOTES_URL
+        : '';
 
     return (
       <Dialog sx={dialogStyle} open={showVersionInfo !== 0} onClose={onClose}>
@@ -112,14 +147,17 @@ const VersionInfoDialog = memo(
                     borderBottom: 'none',
                     pr: 1,
                     py: 0.5,
-                    fontSize: 13,
-                    width: 90
+                    fontSize: 13
                   }}
                 >
-                  {LL.TYPE(0)}
+                  {LL.VERSION()}
                 </TableCell>
                 <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
-                  {isStable ? LL.STABLE() : LL.DEVELOPMENT()}
+                  {isPartition
+                    ? typeof version === 'string'
+                      ? version
+                      : version?.name
+                    : version?.name}
                 </TableCell>
               </TableRow>
               <TableRow sx={{ height: 24, borderBottom: 'none' }}>
@@ -131,15 +169,61 @@ const VersionInfoDialog = memo(
                     borderBottom: 'none',
                     pr: 1,
                     py: 0.5,
-                    fontSize: 13
+                    fontSize: 13,
+                    width: 140
                   }}
                 >
-                  {LL.VERSION()}
+                  {isPartition ? LL.TYPE(0) : LL.RELEASE_TYPE()}
                 </TableCell>
                 <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
-                  {version?.name}
+                  {partition === currentPartition && LL.ACTIVE() + ' '}
+                  {isStable
+                    ? LL.STABLE()
+                    : isDev
+                      ? LL.DEVELOPMENT()
+                      : 'Partition ' + LL.VERSION()}
                 </TableCell>
               </TableRow>
+              {isPartition && (
+                <TableRow sx={{ height: 24, borderBottom: 'none' }}>
+                  <TableCell
+                    component="th"
+                    scope="row"
+                    sx={{
+                      color: 'lightblue',
+                      borderBottom: 'none',
+                      pr: 1,
+                      py: 0.5,
+                      fontSize: 13
+                    }}
+                  >
+                    Partition
+                  </TableCell>
+                  <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
+                    {partition}
+                  </TableCell>
+                </TableRow>
+              )}
+              {isPartition && (
+                <TableRow sx={{ height: 24, borderBottom: 'none' }}>
+                  <TableCell
+                    component="th"
+                    scope="row"
+                    sx={{
+                      color: 'lightblue',
+                      borderBottom: 'none',
+                      pr: 1,
+                      py: 0.5,
+                      fontSize: 13
+                    }}
+                  >
+                    Size
+                  </TableCell>
+                  <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
+                    {size} KB
+                  </TableCell>
+                </TableRow>
+              )}
               {version?.published_at && (
                 <TableRow sx={{ height: 24, borderBottom: 'none' }}>
                   <TableCell
@@ -153,7 +237,7 @@ const VersionInfoDialog = memo(
                       fontSize: 13
                     }}
                   >
-                    Build Date
+                    {isPartition ? 'Install Date' : 'Build Date'}
                   </TableCell>
                   <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
                     {prettyDateTime(locale, new Date(version.published_at))}
@@ -164,15 +248,17 @@ const VersionInfoDialog = memo(
           </Table>
         </DialogContent>
         <DialogActions>
-          <Button
-            variant="outlined"
-            component="a"
-            href={relNotesUrl}
-            target="_blank"
-            color="primary"
-          >
-            Changelog
-          </Button>
+          {!isPartition && (
+            <Button
+              variant="outlined"
+              component="a"
+              href={relNotesUrl}
+              target="_blank"
+              color="primary"
+            >
+              Changelog
+            </Button>
+          )}
           <Button variant="outlined" onClick={onClose} color="secondary">
             {LL.CLOSE()}
           </Button>
@@ -188,6 +274,7 @@ const InstallDialog = memo(
     fetchDevVersion,
     latestVersion,
     latestDevVersion,
+    upgradeImportantMessageType,
     downloadOnly,
     platform,
     LL,
@@ -198,6 +285,7 @@ const InstallDialog = memo(
     fetchDevVersion: boolean;
     latestVersion?: VersionInfo;
     latestDevVersion?: VersionInfo;
+    upgradeImportantMessageType: number;
     downloadOnly: boolean;
     platform: string;
     LL: TranslationFunctions;
@@ -218,15 +306,36 @@ const InstallDialog = memo(
     return (
       <Dialog sx={dialogStyle} open={openInstallDialog} onClose={onClose}>
         <DialogTitle>
-          {`${LL.UPDATE()} ${fetchDevVersion ? LL.DEVELOPMENT() : LL.STABLE()} Firmware`}
+          {`${LL.INSTALL()} ${fetchDevVersion ? LL.DEVELOPMENT() : LL.STABLE()} Firmware`}
         </DialogTitle>
         <DialogContent dividers>
-          <Typography mb={2}>
+          <Typography sx={{ mb: 2 }}>
             {LL.INSTALL_VERSION(
               downloadOnly ? LL.DOWNLOAD(1) : LL.INSTALL(),
               fetchDevVersion ? latestDevVersion?.name : latestVersion?.name
             )}
           </Typography>
+          {upgradeImportantMessageType === 2 && LL.UPGRADE_IMPORTANT_MESSAGES_2()}
+          {upgradeImportantMessageType === 1 && (
+            <>
+              {LL.UPGRADE_IMPORTANT_MESSAGES_1()}
+              <Typography sx={{ mt: 2 }}>
+                <Link to="/settings/downloadUpload" style={{ color: 'lightblue' }}>
+                  {LL.DOWNLOAD_SYSTEM_BACKUP()}
+                </Link>
+              </Typography>
+            </>
+          )}
+          <Typography sx={{ mt: 2 }}>
+            <Link
+              to="https://docs.emsesp.org/FAQ#upgrading-the-firmware"
+              target="_blank"
+              rel="noreferrer"
+              style={{ color: 'lightblue' }}
+            >
+              {LL.ONLINE_HELP()}
+            </Link>
+          </Typography>
         </DialogContent>
         <DialogActions>
           <Button
@@ -243,7 +352,12 @@ const InstallDialog = memo(
             onClick={onClose}
             color="primary"
           >
-            <Link underline="none" target="_blank" href={binURL} color="primary">
+            <Link
+              to={binURL}
+              target="_blank"
+              rel="noreferrer"
+              style={{ color: 'lightblue', textDecoration: 'none' }}
+            >
               {LL.DOWNLOAD(0)}
             </Link>
           </Button>
@@ -263,6 +377,56 @@ const InstallDialog = memo(
   }
 );
 
+const InstallPartitionDialog = memo(
+  ({
+    openInstallPartitionDialog,
+    version,
+    partition,
+    LL,
+    onClose,
+    onInstall
+  }: {
+    openInstallPartitionDialog: boolean;
+    version: string;
+    partition: string;
+    LL: TranslationFunctions;
+    onClose: () => void;
+    onInstall: (partition: string) => void;
+  }) => {
+    return (
+      <Dialog sx={dialogStyle} open={openInstallPartitionDialog} onClose={onClose}>
+        <DialogTitle>
+          {LL.INSTALL()} {LL.STORED_VERSIONS()}
+        </DialogTitle>
+        <DialogContent dividers>
+          <Typography sx={{ mb: 2 }}>
+            {LL.INSTALL_VERSION(LL.INSTALL(), version)}
+          </Typography>
+        </DialogContent>
+        <DialogActions>
+          <Button
+            startIcon={<CancelIcon />}
+            variant="outlined"
+            onClick={onClose}
+            color="secondary"
+          >
+            {LL.CANCEL()}
+          </Button>
+
+          <Button
+            startIcon={<WarningIcon color="warning" />}
+            variant="outlined"
+            onClick={() => onInstall(partition)}
+            color="primary"
+          >
+            {LL.INSTALL()}
+          </Button>
+        </DialogActions>
+      </Dialog>
+    );
+  }
+);
+
 // Helper function moved outside component
 const getPlatform = (data: VersionData): string => {
   return `${data.esp_platform}-${data.flash_chip_size >= 16384 ? '16MB' : '4MB'}${data.psram ? '+' : ''}`;
@@ -275,6 +439,14 @@ const Version = () => {
   // State management
   const [restarting, setRestarting] = useState<boolean>(false);
   const [openInstallDialog, setOpenInstallDialog] = useState<boolean>(false);
+
+  const [partitionVersion, setPartitionVersion] = useState<VersionInfo | undefined>(
+    undefined
+  );
+  const [partition, setPartition] = useState<string>('');
+  const [openInstallPartitionDialog, setOpenInstallPartitionDialog] =
+    useState<boolean>(false);
+
   const [usingDevVersion, setUsingDevVersion] = useState<boolean>(false);
   const [fetchDevVersion, setFetchDevVersion] = useState<boolean>(false);
   const [devUpgradeAvailable, setDevUpgradeAvailable] = useState<boolean>(false);
@@ -282,7 +454,8 @@ const Version = () => {
     useState<boolean>(false);
   const [internetLive, setInternetLive] = useState<boolean>(false);
   const [downloadOnly, setDownloadOnly] = useState<boolean>(false);
-  const [showVersionInfo, setShowVersionInfo] = useState<number>(0);
+  const [showVersionInfo, setShowVersionInfo] = useState<number>(0); // 1 = stable, 2 = dev, 3 = partition
+  const [firmwareSize, setFirmwareSize] = useState<number>(0);
 
   const { send: sendCheckUpgrade } = useRequest(
     (versions: string) => callAction({ action: 'checkUpgrade', param: versions }),
@@ -293,6 +466,13 @@ const Version = () => {
     setStableUpgradeAvailable(data.stable_upgradeable);
   });
 
+  const { send: sendSetPartition } = useRequest(
+    (partition: string) => callAction({ action: 'setPartition', param: partition }),
+    { immediate: false }
+  ).onError((error) => {
+    toast.error(String(error.error?.message || 'An error occurred'));
+  });
+
   const {
     data,
     send: loadData,
@@ -317,20 +497,60 @@ const Version = () => {
     immediate: false
   });
 
+  const [upgradeImportantMessageType, setUpgradeImportantMessageType] =
+    useState<number>(0);
+
+  const { send: checkUpgradeImportantMessages } = useRequest(
+    (version: string) =>
+      callAction({ action: 'upgradeImportantMessages', param: version }),
+    {
+      immediate: false
+    }
+  )
+    .onSuccess((event) => {
+      const upgradeImportantMessageType_n = (
+        event.data as { upgradeImportantMessageType: number }
+      ).upgradeImportantMessageType;
+      setUpgradeImportantMessageType(upgradeImportantMessageType_n);
+    })
+    .onError((error) => {
+      toast.error(String(error.error?.message || 'An error occurred'));
+    });
+
   // Memoized values
   const platform = useMemo(() => (data ? getPlatform(data) : ''), [data]);
-  const isDev = useMemo(
-    () => data?.emsesp_version.includes('dev') ?? false,
-    [data?.emsesp_version]
+
+  // Memoize filtered partitions to avoid recomputing on every render
+  const otherPartitions = useMemo(
+    () => data?.partitions.filter((p) => p.partition !== data.partition) ?? [],
+    [data]
+  );
+
+  const setPartitionVersionInfo = useCallback(
+    (partition: string) => {
+      setShowVersionInfo(3);
+
+      // search for the partition in the data.partitions array
+      const partitionData = data?.partitions.find((p) => p.partition === partition);
+      if (partitionData) {
+        setPartitionVersion({
+          name: partitionData.version,
+          published_at: partitionData.install_date ?? ''
+        });
+        setPartition(partitionData.partition);
+        setFirmwareSize(partitionData.size);
+      }
+    },
+    [data]
   );
 
   const doRestart = useCallback(async () => {
-    setRestarting(true);
     await sendAPI({ device: 'system', cmd: 'restart', id: 0 }).catch(
       (error: Error) => {
         toast.error(error.message);
       }
     );
+    setRestarting(true);
   }, [sendAPI]);
 
   const installFirmwareURL = useCallback(
@@ -338,27 +558,60 @@ const Version = () => {
       await sendUploadURL(url).catch((error: Error) => {
         toast.error(error.message);
       });
-      setRestarting(true);
+      await doRestart();
     },
-    [sendUploadURL]
+    [sendUploadURL, doRestart]
   );
 
-  const showFirmwareDialog = useCallback((useDevVersion: boolean) => {
-    setFetchDevVersion(useDevVersion);
-    setOpenInstallDialog(true);
-  }, []);
+  const installPartitionFirmware = useCallback(
+    async (partition: string) => {
+      await sendSetPartition(partition).catch((error: Error) => {
+        toast.error(error.message);
+      });
+      setRestarting(true);
+    },
+    [sendSetPartition]
+  );
+
+  const showPartitionDialog = useCallback(
+    (version: string, partition: string, install_date: string) => {
+      setOpenInstallPartitionDialog(true);
+      setPartitionVersion({ name: version, published_at: install_date });
+      setPartition(partition);
+    },
+    []
+  );
+
+  const showFirmwareDialog = useCallback(
+    (useDevVersion: boolean) => {
+      setFetchDevVersion(useDevVersion);
+      void checkUpgradeImportantMessages(
+        useDevVersion ? latestDevVersion?.name : latestVersion?.name
+      );
+      setOpenInstallDialog(true);
+    },
+    [latestDevVersion, latestVersion, fetchDevVersion]
+  );
 
   const closeInstallDialog = useCallback(() => {
     setOpenInstallDialog(false);
   }, []);
 
-  const handleVersionInfoClose = useCallback(() => {
-    setShowVersionInfo(0);
+  const closeInstallPartitionDialog = useCallback(() => {
+    setOpenInstallPartitionDialog(false);
   }, []);
 
-  // Effect for checking upgrades
+  const handleVersionInfoClose = useCallback(() => {
+    setShowVersionInfo(0);
+    setPartitionVersion(undefined);
+    setPartition('');
+  }, []);
+
+  // check upgrades - only once when both versions are available
+  const upgradeCheckedRef = useRef(false);
   useEffect(() => {
-    if (latestVersion && latestDevVersion) {
+    if (latestVersion && latestDevVersion && !upgradeCheckedRef.current) {
+      upgradeCheckedRef.current = true;
       const versions = `${latestDevVersion.name},${latestVersion.name}`;
       sendCheckUpgrade(versions)
         .catch((error: Error) => {
@@ -398,7 +651,7 @@ const Version = () => {
               {LL.LATEST_VERSION(usingDevVersion ? LL.DEVELOPMENT() : LL.STABLE())}
             </span>
             <Button
-              sx={{ ml: 2 }}
+              sx={{ ml: 1 }}
               variant="outlined"
               size="small"
               onClick={() => showFirmwareDialog(showingDev)}
@@ -413,7 +666,7 @@ const Version = () => {
 
       return (
         <Button
-          sx={{ ml: 2 }}
+          sx={{ ml: 1 }}
           variant="outlined"
           color={choice === LL.UPDATE_AVAILABLE() ? 'success' : 'warning'}
           size="small"
@@ -440,15 +693,14 @@ const Version = () => {
 
     return (
       <>
-        <Box p={2} border="1px solid grey" borderRadius={2}>
-          <Typography mb={2} variant="h6" color="primary">
+        <Box sx={{ p: 2, border: '1px solid #565656', borderRadius: 2 }}>
+          <Typography sx={{ mb: 1 }} variant="h6" color="primary">
             {LL.THIS_VERSION()}
           </Typography>
 
           <Grid
             container
             direction="row"
-            rowSpacing={1}
             sx={{
               justifyContent: 'flex-start',
               alignItems: 'baseline'
@@ -465,6 +717,12 @@ const Version = () => {
                     &nbsp; &#40;{data.build_flags}&#41;
                   </Typography>
                 )}
+                <IconButton
+                  onClick={() => setPartitionVersionInfo(data.partition)}
+                  aria-label={LL.FIRMWARE_VERSION_INFO()}
+                >
+                  <InfoOutlinedIcon color="primary" sx={{ fontSize: 18 }} />
+                </IconButton>
               </Typography>
             </Grid>
 
@@ -497,57 +755,11 @@ const Version = () => {
                 </Typography>
               </Typography>
             </Grid>
-
-            <Grid size={{ xs: 4, md: 2 }}>
-              <Typography color="secondary">{LL.RELEASE_TYPE()}</Typography>
-            </Grid>
-            <Grid size={{ xs: 8, md: 10 }}>
-              <FormControlLabel
-                disabled={!isDev}
-                control={
-                  <Checkbox
-                    sx={{
-                      '&.Mui-checked': {
-                        color: 'lightblue'
-                      }
-                    }}
-                  />
-                }
-                slotProps={{
-                  typography: {
-                    color: 'grey'
-                  }
-                }}
-                checked={!isDev}
-                label={LL.STABLE()}
-                sx={{ '& .MuiSvgIcon-root': { fontSize: 16 } }}
-              />
-              <FormControlLabel
-                disabled={isDev}
-                control={
-                  <Checkbox
-                    sx={{
-                      '&.Mui-checked': {
-                        color: 'lightblue'
-                      }
-                    }}
-                  />
-                }
-                slotProps={{
-                  typography: {
-                    color: 'grey'
-                  }
-                }}
-                checked={isDev}
-                label={LL.DEVELOPMENT()}
-                sx={{ '& .MuiSvgIcon-root': { fontSize: 16 } }}
-              />
-            </Grid>
           </Grid>
 
           {internetLive ? (
             <>
-              <Typography mt={2} mb={2} variant="h6" color="primary">
+              <Typography sx={{ mt: 4, mb: 1 }} variant="h6" color="primary">
                 {LL.AVAILABLE_VERSION()}
               </Typography>
 
@@ -560,6 +772,47 @@ const Version = () => {
                   alignItems: 'baseline'
                 }}
               >
+                {otherPartitions.length > 0 && data.developer_mode && (
+                  <>
+                    <Grid size={{ xs: 4, md: 2 }}>
+                      <Typography color="secondary">
+                        {LL.STORED_VERSIONS()}
+                      </Typography>
+                    </Grid>
+                    <Grid size={{ xs: 8, md: 10 }}>
+                      {otherPartitions.map((partition) => (
+                        <Typography key={partition.partition} sx={{ mb: 1 }}>
+                          {partition.version}
+                          <IconButton
+                            onClick={() =>
+                              setPartitionVersionInfo(partition.partition)
+                            }
+                            aria-label={LL.FIRMWARE_VERSION_INFO()}
+                          >
+                            <InfoOutlinedIcon
+                              color="primary"
+                              sx={{ fontSize: 18 }}
+                            />
+                          </IconButton>
+                          <Button
+                            sx={{ ml: 0 }}
+                            variant="outlined"
+                            size="small"
+                            onClick={() =>
+                              showPartitionDialog(
+                                partition.version,
+                                partition.partition,
+                                partition.install_date ?? ''
+                              )
+                            }
+                          >
+                            {LL.INSTALL()}
+                          </Button>
+                        </Typography>
+                      ))}
+                    </Grid>
+                  </>
+                )}
                 <Grid size={{ xs: 4, md: 2 }}>
                   <Typography color="secondary">{LL.STABLE()}</Typography>
                 </Grid>
@@ -594,7 +847,7 @@ const Version = () => {
               </Grid>
             </>
           ) : (
-            <Typography mt={2} color="warning">
+            <Typography sx={{ mt: 2 }} color="warning">
               <WarningIcon color="warning" sx={{ verticalAlign: 'middle', mr: 2 }} />
               {LL.INTERNET_CONNECTION_REQUIRED()}
             </Typography>
@@ -605,7 +858,11 @@ const Version = () => {
                 showVersionInfo={showVersionInfo}
                 latestVersion={latestVersion}
                 latestDevVersion={latestDevVersion}
+                partitionVersion={partitionVersion}
                 locale={locale}
+                partition={partition}
+                currentPartition={data?.partition ?? ''}
+                size={firmwareSize}
                 LL={LL}
                 onClose={handleVersionInfoClose}
               />
@@ -614,16 +871,25 @@ const Version = () => {
                 fetchDevVersion={fetchDevVersion}
                 latestVersion={latestVersion}
                 latestDevVersion={latestDevVersion}
+                upgradeImportantMessageType={upgradeImportantMessageType}
                 downloadOnly={downloadOnly}
                 platform={platform}
                 LL={LL}
                 onClose={closeInstallDialog}
                 onInstall={installFirmwareURL}
               />
+              <InstallPartitionDialog
+                openInstallPartitionDialog={openInstallPartitionDialog}
+                version={partitionVersion?.name || ''}
+                partition={partition}
+                LL={LL}
+                onClose={closeInstallPartitionDialog}
+                onInstall={installPartitionFirmware}
+              />
               <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
                 {LL.UPLOAD()}
               </Typography>
-              <SingleUpload text={LL.UPLOAD_DROP_TEXT()} doRestart={doRestart} />
+              <SingleUpload doRestart={doRestart} />
             </>
           )}
         </Box>
@@ -635,7 +901,6 @@ const Version = () => {
     loadData,
     LL,
     platform,
-    isDev,
     internetLive,
     latestVersion,
     latestDevVersion,
@@ -649,10 +914,18 @@ const Version = () => {
     handleVersionInfoClose,
     closeInstallDialog,
     installFirmwareURL,
-    doRestart
+    doRestart,
+    otherPartitions,
+    setPartitionVersionInfo,
+    showPartitionDialog,
+    partitionVersion,
+    partition,
+    firmwareSize,
+    closeInstallPartitionDialog,
+    installPartitionFirmware
   ]);
 
-  return <SectionContent>{restarting ? <SystemMonitor /> : content}</SectionContent>;
+  return restarting ? <SystemMonitor /> : <SectionContent>{content}</SectionContent>;
 };
 
 export default memo(Version);

interface/src/components/ButtonRow.tsx

@@ -1,9 +1,9 @@
-import { memo } from 'react';
+import { type FC, type PropsWithChildren, memo } from 'react';
 
 import { Box } from '@mui/material';
 import type { BoxProps } from '@mui/material';
 
-const ButtonRow = memo<BoxProps>(({ children, ...rest }) => (
+const ButtonRow: FC<PropsWithChildren<BoxProps>> = memo(({ children, ...rest }) => (
   <Box
     sx={{
       '& button, & a, & .MuiCard-root': {

interface/src/components/MessageBox.tsx

@@ -1,4 +1,4 @@
-import { type FC, memo, useMemo } from 'react';
+import { type FC, type PropsWithChildren, memo, useMemo } from 'react';
 
 import CheckCircleOutlineOutlinedIcon from '@mui/icons-material/CheckCircleOutlineOutlined';
 import ErrorIcon from '@mui/icons-material/Error';
@@ -12,6 +12,7 @@ type MessageBoxLevel = 'warning' | 'success' | 'info' | 'error';
 export interface MessageBoxProps extends BoxProps {
   level: MessageBoxLevel;
   message?: string;
+  children?: React.ReactNode;
 }
 
 const LEVEL_ICONS: Record<MessageBoxLevel, React.ComponentType<SvgIconProps>> = {
@@ -28,7 +29,7 @@ const LEVEL_PALETTE_PATHS: Record<MessageBoxLevel, string> = {
   error: 'error.dark'
 };
 
-const MessageBox: FC<MessageBoxProps> = ({
+const MessageBox: FC<PropsWithChildren<MessageBoxProps>> = ({
   level,
   message,
   sx,
@@ -52,12 +53,16 @@ const MessageBox: FC<MessageBoxProps> = ({
 
   return (
     <Box
-      p={2}
-      display="flex"
-      alignItems="center"
-      borderRadius={1}
-      sx={{ backgroundColor, color: 'white', ...sx }}
       {...rest}
+      sx={{
+        display: 'flex',
+        alignItems: 'center',
+        borderRadius: 1,
+        backgroundColor,
+        color: 'white',
+        p: 2,
+        ...sx
+      }}
     >
       <Icon />
       {(message || children) && (

interface/src/components/inputs/LanguageSelector.tsx

@@ -19,10 +19,8 @@ import { I18nContext } from 'i18n/i18n-react';
 import type { Locales } from 'i18n/i18n-types';
 import { loadLocaleAsync } from 'i18n/i18n-util.async';
 
-// Extract style to constant to prevent recreation
 const flagStyle: CSSProperties = { width: 16, verticalAlign: 'middle' };
 
-// Define language options outside component to prevent recreation
 interface LanguageOption {
   key: Locales;
   flag: string;

interface/src/components/inputs/ValidatedTextField.tsx

@@ -15,6 +15,7 @@ export type ValidatedTextFieldProps = ValidatedFieldProps & TextFieldProps;
 
 const ValidatedTextField: FC<ValidatedTextFieldProps> = ({
   fieldErrors,
+  sx,
   ...rest
 }) => {
   const errors = fieldErrors?.[rest.name];
@@ -25,11 +26,23 @@ const ValidatedTextField: FC<ValidatedTextFieldProps> = ({
         error={!!errors}
         {...rest}
         aria-label="Error"
-        slotProps={{
-          inputLabel: {
-            style: rest.disabled ? { color: 'grey' } : undefined
-          }
+        sx={{
+          '& .MuiInputBase-input.Mui-disabled': {
+            WebkitTextFillColor: 'grey'
+          },
+          ...(sx || {})
         }}
+        {...(rest.disabled && {
+          slotProps: {
+            select: {
+              IconComponent: () => null
+            },
+            inputLabel: {
+              style: { color: 'grey' }
+            }
+          }
+        })}
+        color={rest.disabled ? 'secondary' : 'primary'}
       />
       {errors?.map((e) => (
         <FormHelperText key={e.message} sx={{ color: 'rgb(250, 95, 84)' }}>

interface/src/components/layout/LayoutDrawer.tsx

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

interface/src/components/layout/LayoutMenu.tsx

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

interface/src/components/layout/LayoutMenuItem.tsx

@@ -39,9 +39,8 @@ const LayoutMenuItemComponent = ({
         left: 0,
         top: 0,
         bottom: 0,
-        width: selected ? '4px' : '0px',
+        width: selected ? '3px' : '0px',
         backgroundColor: '#90caf9',
-        borderRadius: '0 2px 2px 0',
         transition: 'width 0.05s cubic-bezier(0.55, 0.085, 0.68, 0.53)'
       }
     }),

interface/src/components/layout/ListMenuItem.tsx

@@ -22,7 +22,6 @@ interface ListMenuItemProps {
   disabled?: boolean;
 }
 
-// Extract styles to prevent recreation
 const iconStyles: CSSProperties = {
   justifyContent: 'right',
   color: 'lightblue',

interface/src/components/loading/FormLoader.tsx

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

interface/src/components/loading/LazyLoader.tsx

@@ -3,7 +3,6 @@ import { memo } from 'react';
 import { Box, CircularProgress } from '@mui/material';
 import type { SxProps, Theme } from '@mui/material';
 
-// Extract styles to prevent recreation on every render
 const containerStyles: SxProps<Theme> = {
   display: 'flex',
   justifyContent: 'center',

interface/src/components/loading/LoadingSpinner.tsx

@@ -7,7 +7,6 @@ interface LoadingSpinnerProps {
   height?: number | string;
 }
 
-// Extract styles to prevent recreation on every render
 const circularProgressStyles: SxProps<Theme> = (theme: Theme) => ({
   margin: theme.spacing(4),
   color: theme.palette.text.secondary
@@ -16,12 +15,14 @@ const circularProgressStyles: SxProps<Theme> = (theme: Theme) => ({
 const LoadingSpinner = ({ height = '100%' }: LoadingSpinnerProps) => {
   return (
     <Box
-      display="flex"
-      alignItems="center"
-      justifyContent="center"
-      flexDirection="column"
-      padding={2}
-      height={height}
+      sx={{
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        flexDirection: 'column',
+        padding: 2,
+        height
+      }}
     >
       <CircularProgress sx={circularProgressStyles} size={100} />
     </Box>

interface/src/components/upload/DragNdrop.tsx

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

interface/src/components/upload/SingleUpload.tsx

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

interface/src/i18n/cz/index.ts

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

interface/src/i18n/de/index.ts

@@ -186,7 +186,8 @@ const de: Translation = {
   BUFFER_SIZE: 'Max. Puffergröße',
   COMPACT: 'Kompakte Darstellung',
   DOWNLOAD_SETTINGS_TEXT: 'Erstellen Sie eine Sicherung Ihrer Konfigurationen und Einstellungen',
-  DOWNLOAD_SETTINGS_TEXT2: 'Exportiere alle Daten',
+  DOWNLOAD_SETTINGS_TEXT2: 'Exportiere alle Werte',
+  DOWNLOAD_SYSTEM_BACKUP: 'Systemsicherung',
   UPLOAD_TEXT: 'Laden Sie eine neue Firmware-Datei (.bin) oder eine Sicherungsdatei (.json) hoch',
   UPLOAD_DROP_TEXT: 'Legen Sie eine Firmware-Datei (.bin) ab oder klicken Sie hier',
   ERROR: 'Unerwarteter Fehler, bitte versuchen Sie es erneut.',
@@ -219,6 +220,7 @@ const de: Translation = {
   MQTT_PUBLISH_TEXT_3: 'Aktiviere `MQTT Discovery`',
   MQTT_PUBLISH_TEXT_4: 'Prefix für die `Discovery`-Topics',
   MQTT_PUBLISH_TEXT_5: 'Discovery Typ',
+  MQTT_INPUT_NUMBER_FORMAT: 'Zahlenformat',
   MQTT_PUBLISH_INTERVALS: 'Veröffentlichungs-Intervalle',
   MQTT_INT_BOILER: 'Boiler und Wärmepumpen',
   MQTT_INT_THERMOSTATS: 'Thermostate',
@@ -348,6 +350,7 @@ const de: Translation = {
   NO_DATA_1: 'Keine favorisierten EMS-Entitäten gefunden! Verwenden Sie das Modul',
   NO_DATA_2: ', um sie zu markieren.',
   NO_DATA_3: 'Um alle verfügbaren Entitäten anzuzeigen, gehen Sie zu',
+  NO_GPIO: 'Keine freien GPIO gefunden',
   THIS_VERSION: 'Diese Version',
   PLATFORM: 'Plattform',
   RELEASE_TYPE: 'Release Typ',
@@ -355,7 +358,14 @@ const de: Translation = {
   SWITCH_RELEASE_TYPE: 'Zum {0}-Release wechseln',
   FIRMWARE_VERSION_INFO: 'Firmware-Versionsinformation',
   NO_DATA: 'Keine Daten',
-  USER_PROFILE: 'Benutzerprofil'
+  USER_PROFILE: 'Benutzerprofil',
+  STORED_VERSIONS: 'Gespeicherte Versionen',
+  ONLINE_HELP: 'Online-Hilfe',
+  UPGRADE_IMPORTANT_MESSAGES: 'Wichtige Nachrichten aktualisieren',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Für diese Aktualisierung ist ein Werksreset erforderlich. Stellen Sie sicher, dass Sie zuerst eine Systemsicherung herunterladen, bevor Sie fortfahren, und laden Sie diese Datei dann nach der Installation der neuen Version hoch.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Sie aktualisieren auf eine neue Hauptversion. Stellen Sie sicher, dass Sie den ChangeLog für alle wichtigen Änderungen gelesen haben.',
+  WARNING_SYSTEM_BACKUP: 'Dies wird eine Sicherung Ihrer vollständigen Systemkonfiguration und Einstellungen erstellen. Alle Passwörter werden in dieser Sicherungsdatei lesbar sein. Seien Sie vorsichtig beim Teilen! Möchten Sie fortfahren?'
+
 };
 
 export default de;

interface/src/i18n/en/index.ts

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

interface/src/i18n/fr/index.ts

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

interface/src/i18n/it/index.ts

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

interface/src/i18n/nl/index.ts

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

interface/src/i18n/no/index.ts

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

interface/src/i18n/pl/index.ts

@@ -186,7 +186,8 @@ const pl: BaseTranslation = {
   BUFFER_SIZE: 'Maksymalna pojemność bufora (ilość wpisów)',
   COMPACT: 'Kompaktowy',
   DOWNLOAD_SETTINGS_TEXT: 'Utwórz kopię swoich ustawień i konfiguracji',
-  DOWNLOAD_SETTINGS_TEXT2: 'Eksportuj wszystkie dane',
+  DOWNLOAD_SETTINGS_TEXT2: 'Eksportuj wszystkie wartości',
+  DOWNLOAD_SYSTEM_BACKUP: 'Kopia zapasowa systemu',
   UPLOAD_TEXT: 'Wgraj nowy plik firmware (.bin) lub kopię ustawień (.json)',
   UPLOAD_DROP_TEXT: 'Upuść plik firmware .bin lub kliknij tutaj',
   ERROR: 'Nieoczekiwany błąd, spróbuj ponownie!',
@@ -219,6 +220,7 @@ const pl: BaseTranslation = {
   MQTT_PUBLISH_TEXT_3: 'Włącz opcję "MQTT discovery"',
   MQTT_PUBLISH_TEXT_4: 'Prefiks dla "MQTT discovery"',
   MQTT_PUBLISH_TEXT_5: 'Typ "MQTT discovery"',
+  MQTT_INPUT_NUMBER_FORMAT: 'Format liczby',
   MQTT_PUBLISH_INTERVALS: 'Interwały publikowania',
   MQTT_INT_BOILER: 'Kotły i pompy ciepła',
   MQTT_INT_THERMOSTATS: 'Termostaty',
@@ -331,7 +333,7 @@ const pl: BaseTranslation = {
   SERVICES: 'Usługi',
   ALLVALUES: 'Wszystkie wartości',
   SPECIAL_FUNCTIONS: 'Specjalne funkcje',
-  WAIT_FIRMWARE: 'Firma jest wysyłana i instaluje się',
+  WAIT_FIRMWARE: 'Firmware ściąga się i instaluje',
   INSTALL_VERSION: 'To zainstaluje wersję {1} {0}. Jesteś pewny?',
   UPDATE_AVAILABLE: 'aktualizacja dostępna',
   LATEST_VERSION: 'Jesteś używając najnowszej wersji firmware {0}',
@@ -348,6 +350,7 @@ const pl: BaseTranslation = {
   NO_DATA_1: 'Brak ulubionych encji EMS. Użyj',
   NO_DATA_2: 'moduł do ich oznaczenia.',
   NO_DATA_3: 'Aby zobaczyć wszystkie dostępne encje przejdź do',
+  NO_GPIO: 'Nie znaleziono dostępnych pinów GPIO',
   THIS_VERSION: 'Ta wersja',
   PLATFORM: 'Platforma',
   RELEASE_TYPE: 'Typ wydania',
@@ -355,7 +358,14 @@ const pl: BaseTranslation = {
   SWITCH_RELEASE_TYPE: 'Zmień na {0} wydanie',
   FIRMWARE_VERSION_INFO: 'Informacje o wersji firmware',
   NO_DATA: 'Brak danych',
-  USER_PROFILE: 'Profil użytkownika'
+  USER_PROFILE: 'Profil użytkownika',
+  STORED_VERSIONS: 'Zapisane wersje',
+  ONLINE_HELP: 'pomoc online',
+  UPGRADE_IMPORTANT_MESSAGES: 'Aktualizuj ważne wiadomości',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Ta aktualizacja wymaga resetu fabrycznego. Upewnij się, że najpierw pobierzesz kopię zapasową systemu przed kontynuowaniem, a następnie przesuń tę plik po zainstalowaniu nowej wersji.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujesz się do nowej głównej wersji. Upewnij się, że przeczytałeś ChangeLog dla wszelkich istotnych zmian.',
+  WARNING_SYSTEM_BACKUP: 'To spowoduje utworzenie kopii zapasowej całej konfiguracji i ustawień systemu. Wszystkie hasła będą widoczne w pliku kopii zapasowej. Bądź ostrożny przy udostępnianiu! Chcesz kontynuować?'
+
 };
 
 export default pl;

interface/src/i18n/sk/index.ts

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

interface/src/i18n/sv/index.ts

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

interface/src/i18n/tr/index.ts

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

interface/src/index.tsx

@@ -91,12 +91,12 @@ function ErrorPage() {
       <p style={errorPageStyles.message2}>
         Please report on{' '}
         <a
-          href="https://docs.emsesp.org/Support"
+          href="https://emsesp.org/Support"
           target="_blank"
           rel="noreferrer"
           style={{ color: 'inherit', textDecoration: 'underline' }}
         >
-          https://docs.emsesp.org/Support
+          https://emsesp.org/Support
         </a>
       </p>
     </div>

interface/src/types/mqtt.ts

@@ -49,4 +49,5 @@ export interface MqttSettingsType {
   publish_single2cmd: boolean;
   discovery_prefix: string;
   discovery_type: number;
+  ha_number_mode: number;
 }

interface/src/types/system.ts

@@ -2,13 +2,15 @@ import type { busConnectionStatus } from 'app/main/types';
 
 import type { NetworkConnectionStatus } from './network';
 
+// match SYSTEM_STATUS in System.h
 export enum SystemStatusCodes {
   SYSTEM_STATUS_NORMAL = 0,
   SYSTEM_STATUS_PENDING_UPLOAD = 1,
   SYSTEM_STATUS_UPLOADING = 100,
   SYSTEM_STATUS_ERROR_UPLOAD = 3,
   SYSTEM_STATUS_PENDING_RESTART = 4,
-  SYSTEM_STATUS_RESTART_REQUESTED = 5
+  SYSTEM_STATUS_RESTART_REQUESTED = 5,
+  SYSTEM_STATUS_INVALID_GPIO = 6
 }
 
 export interface SystemStatus {
@@ -48,9 +50,17 @@ export interface SystemStatus {
   free_psram?: number;
   free_caps: number;
   model: string;
+  board: string;
   has_loader: boolean;
   has_partition: boolean;
-  status: number; // SystemStatusCodes which matches SYSTEM_STATUS in System.h
+  partitions: {
+    partition: string;
+    version: string;
+    size: number;
+    install_date?: string;
+  }[];
+  status: number; // System Status Codes which matches SYSTEM_STATUS in System.h
+  developer_mode: boolean;
   temperature?: number;
 }
 

interface/src/utils/file.ts

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

interface/src/utils/useInterval.ts

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

interface/src/utils/useRest.ts

@@ -60,21 +60,28 @@ export const useRest = <D>({ read, update }: RestRequestOptions<D>) => {
     // Reset states before saving
     setRestartNeeded(false);
     setErrorMessage(undefined);
-    setDirtyFlags([]);
-    setOrigData(data as D);
 
     try {
       await writeData(data as D);
+      // Only update origData on successful save (dirtyFlags cleared by onSuccess handler)
+      setOrigData(data as D);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
+
       if (message === REBOOT_ERROR_MESSAGE) {
         setRestartNeeded(true);
-      } else {
-        toast.error(message);
-        setErrorMessage(message);
+        return; // Early return - save succeeded but needs reboot
       }
+
+      // Restore original data on validation error
+      if (origData) {
+        updateData({ data: origData });
+      }
+      toast.error(message);
+      setErrorMessage(message);
+      setDirtyFlags([]); // Clear flags so user can retry
     }
-  }, [data, writeData]);
+  }, [data, writeData, origData, updateData]);
 
   return useMemo(
     () => ({

interface/src/validators/shared.ts

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