Merge pull request #3256 from proddy/main

copy over 3.9.0-dev optimizations to load pre_load.json faster

CHANGELOG.md

@@ -5,6 +5,58 @@ 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.6] 24 September 2026
+
+## Added
+
+- own rgb_led library supporting WS2812B V5 and the newer V6 RGB LEDs
+
+## [3.8.5] 22 September 2026
+
+## Added
+
+- Change webUI message when upgrading to a major version of the firmware, in preparation for the upcoming 3.9.0 release.
+
+## [3.8.4] 4 August 2026
+
+## Fixed
+
+- Allow auto-download and install of firmware versions which are smaller to allow update to the latest 3.9.0-development version.
+
+## Changed
+
+## [3.8.3] 1 August 2026
+
+## Added
+
+- KM300 at address 0x4A [#3084](https://github.com/emsesp/EMS-ESP32/issues/3084)
+
+## Fixed
+
+- signed value for solarInfuence [#3077](https://github.com/emsesp/EMS-ESP32/issues/3077)
+- set bin file upload limit to 1M again [#3086](https://github.com/emsesp/EMS-ESP32/issues/3086)
+- check arithmetric operations on strings [#3127](https://github.com/emsesp/EMS-ESP32/discussions/3127)
+- prevent system crash during WiFi network discovery on ESP32-S3 hardware [#3128](https://github.com/emsesp/EMS-ESP32/pull/3128)
+- fix setting date/time on Junkers thermostats
+- offset of hpminflowtemp [#3144](https://github.com/emsesp/EMS-ESP32/issues/3144)
+- water circulation command [#3149](https://github.com/emsesp/EMS-ESP32/pull/3149)
+- start scheduler after customEntities, delay scheduler loop after startup, handling of `system/restart` command [#3146](https://github.com/emsesp/EMS-ESP32/issues/3146)
+- possible memory leaks fixed.
+- repeated startup schedules compute value
+- call `system/message` called from scheduler processes compute twice
+- water module SM100/200 as dhw1/dhw2 [#3164](https://github.com/emsesp/EMS-ESP32/issues/3164)
+
+## Changed
+
+- call compute value direct, enlarge TCP stack [#3127](https://github.com/emsesp/EMS-ESP32/discussions/3127)
+- Dewtemperature for Easycontrol calculated by ems-esp [#3135](https://github.com/emsesp/EMS-ESP32/issues/3135)
+- add option for sync thermostat to ntp, allow different time zones [#3148](https://github.com/emsesp/EMS-ESP32/discussions/3148), **defaults to sync**.
+- block too many GET requests [mentioned in #3104](https://github.com/emsesp/EMS-ESP32/issues/3104)
+- set 10 sec timeout for http requests [#3104](https://github.com/emsesp/EMS-ESP32/issues/3104)
+- language code "cs" [#3161](https://github.com/emsesp/EMS-ESP32/issues/3161)
+
+
 ## [3.8.2] 12 May 2026
 
 ## Added
@@ -71,7 +123,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - board profile `CUSTOM` can only be selected in developer mode
 - mqtt sends round values without decimals (`28` instead of `28.0`)
 
-
 ## [3.8.0] 31 December 2025
 
 ## Added

CHANGELOG_LATEST.md

@@ -2,32 +2,8 @@
 
 For more details go to [emsesp.org](https://emsesp.org/).
 
-## [3.8.3]
-
 ## Added
 
-- KM300 at address 0x4A [#3084](https://github.com/emsesp/EMS-ESP32/issues/3084)
-
 ## Fixed
 
-- signed value for solarInfuence [#3077](https://github.com/emsesp/EMS-ESP32/issues/3077)
-- set bin file upload limit to 1M again [#3086](https://github.com/emsesp/EMS-ESP32/issues/3086)
-- check arithmetric operations on strings [#3127](https://github.com/emsesp/EMS-ESP32/discussions/3127)
-- prevent system crash during WiFi network discovery on ESP32-S3 hardware [#3128](https://github.com/emsesp/EMS-ESP32/pull/3128)
-- fix setting date/time on Junkers thermostats
-- offset of hpminflowtemp [#3144](https://github.com/emsesp/EMS-ESP32/issues/3144)
-- water circulation command [#3149](https://github.com/emsesp/EMS-ESP32/pull/3149)
-- start scheduler after customEntities, delay scheduler loop after startup, handling of `system/restart` command [#3146](https://github.com/emsesp/EMS-ESP32/issues/3146)
-- possible memory leaks fixed.
-- repeated startup schedules compute value
-- call `system/message` called from scheduler processes compute twice
-- water module SM100/200 as dhw1/dhw2 [#3164](https://github.com/emsesp/EMS-ESP32/issues/3164)
-
 ## Changed
-
-- call compute value direct, enlarge TCP stack [#3127](https://github.com/emsesp/EMS-ESP32/discussions/3127)
-- Dewtemperature for Easycontrol calculated by ems-esp [#3135](https://github.com/emsesp/EMS-ESP32/issues/3135)
-- add option for sync thermostat to ntp, allow different time zones [#3148](https://github.com/emsesp/EMS-ESP32/discussions/3148), **defaults to sync**.
-- block too many GET requests [mentioned in #3104](https://github.com/emsesp/EMS-ESP32/issues/3104)
-- set 10 sec timeout for http requests [#3104](https://github.com/emsesp/EMS-ESP32/issues/3104)
-- language code "cs" [#3161](https://github.com/emsesp/EMS-ESP32/issues/3161)

interface/package.json

@@ -52,8 +52,8 @@
     "@preact/compat": "^18.3.2",
     "@preact/preset-vite": "^2.10.5",
     "@trivago/prettier-plugin-sort-imports": "^6.0.2",
-    "@types/node": "^25.9.5",
-    "@types/react": "^19.2.17",
+    "@types/node": "^25.7.0",
+    "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "axe-core": "^4.12.1",
     "concurrently": "^9.2.4",
@@ -61,9 +61,9 @@
     "eslint-config-prettier": "^10.1.8",
     "prettier": "^3.9.5",
     "rollup-plugin-visualizer": "^7.0.1",
-    "terser": "^5.49.0",
-    "typescript-eslint": "^8.63.0",
-    "vite": "^8.1.4",
+    "terser": "^5.47.1",
+    "typescript-eslint": "^8.59.3",
+    "vite": "^8.0.12",
     "vite-plugin-imagemin": "^0.6.1",
     "vite-tsconfig-paths": "^6.1.1"
   },

interface/src/app/status/Version.tsx

@@ -316,16 +316,12 @@ const InstallDialog = memo(
             )}
           </Typography>
           {upgradeImportantMessageType === 2 && LL.UPGRADE_IMPORTANT_MESSAGES_2()}
-          {upgradeImportantMessageType === 1 && (
-            <>
-              {LL.UPGRADE_IMPORTANT_MESSAGES_1()}
+          {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"

interface/src/i18n/cs/index.ts

@@ -363,7 +363,7 @@ const cs: Translation = {
   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.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujete se na novou major verzi. Je vhodné nejprve vytvořit systémovou zálohu. Také zkontrolujte online nápovědu pro jakékoliv závažné změny.',
   WARNING_SYSTEM_BACKUP: 'Toto vytvoří zálohu vašich celých systémových konfigurací a nastavení. Všechna hesla budou v zálohovém souboru čitelná. Buďte opatrní při sdílení! Opravdu chcete pokračovat?'
 
 };

interface/src/i18n/de/index.ts

@@ -363,7 +363,7 @@ const de: Translation = {
   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.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Sie aktualisieren auf eine neue major Version. Es ist ratsam, zuerst eine Systemsicherung zu erstellen. Überprüfen Sie auch die Online-Hilfe für eventuelle wichtige Änderungen.',
   WARNING_SYSTEM_BACKUP: 'Dies wird eine Sicherung Ihrer vollständigen Systemkonfiguration und Einstellungen erstellen. Alle Passwörter werden in dieser Sicherungsdatei lesbar sein. Seien Sie vorsichtig beim Teilen! Möchten Sie fortfahren?'
 
 };

interface/src/i18n/en/index.ts

@@ -363,7 +363,7 @@ const en: Translation = {
   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.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'You are upgrading to a new major version. It is advisable to make a system backup first. Also check the online help for any breaking changes.',
   WARNING_SYSTEM_BACKUP: 'This will create a backup of your full system configuration and settings. All passwords will be readable in the backup file. Be careful with sharing! Do you want to continue?'
 
 };

interface/src/i18n/fr/index.ts

@@ -363,7 +363,7 @@ const fr: Translation = {
   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.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Vous mettez à jour vers une nouvelle version majeure. Il est recommandé de créer d\'abord une sauvegarde système. Vérifiez également l\'aide en ligne pour les éventuelles modifications importantes.',
   WARNING_SYSTEM_BACKUP: 'Cela créera une sauvegarde de votre configuration et paramètres complets. Tous les mots de passe seront lisibles dans le fichier de sauvegarde. Soyez prudent avec le partage ! Voulez-vous continuer ?'
 
 };

interface/src/i18n/it/index.ts

@@ -363,7 +363,7 @@ const it: Translation = {
   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.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Stai aggiornando a una nuova versione major. È consigliabile prima creare un backup del sistema. Controlla anche l\'aiuto online per eventuali modifiche importanti.',
   WARNING_SYSTEM_BACKUP: 'Questo creerà un backup delle tue configurazioni e impostazioni complete. Tutte le password saranno leggibili nel file di backup. Sei sicuro di voler continuare?'
 
 };

interface/src/i18n/nl/index.ts

@@ -363,7 +363,7 @@ const nl: Translation = {
   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.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'U updatet naar een nieuwe major versie. Het is raadzaam om eerst een systeem backup te maken. Controleer ook de online help voor eventuele brekende wijzigingen.',
   WARNING_SYSTEM_BACKUP: 'Dit zal een back-up van uw volledige systeemconfiguratie en instellingen maken. Alle wachtwoorden zijn leesbaar in het back-upbestand. Wees voorzichtig bij delen! Wilt u doorgaan?'
 
 };

interface/src/i18n/no/index.ts

@@ -363,7 +363,7 @@ const no: Translation = {
   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.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Du oppdaterer til en ny major versjon. Det er anbefalt å først lage en systembackup. Kontroller også onlinehjelp for eventuelle viktige endringer.',
   WARNING_SYSTEM_BACKUP: 'Dette vil lage en sikkerhetskopi av din fullstendige systemkonfigurasjon og innstillinger. Alle passord vil være lesbare i sikkerhetskopien. Vær forsiktig med deling! Vil du fortsette?'
 
 };

interface/src/i18n/pl/index.ts

@@ -363,7 +363,7 @@ const pl: BaseTranslation = {
   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.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujesz się na nową major wersję. Jest to zalecane, aby najpierw utworzyć kopię zapasową systemu. Sprawdź również online pomoc dla ewentualnych istotnych zmian.',
   WARNING_SYSTEM_BACKUP: 'To spowoduje utworzenie kopii zapasowej całej konfiguracji i ustawień systemu. Wszystkie hasła będą widoczne w pliku kopii zapasowej. Bądź ostrożny przy udostępnianiu! Chcesz kontynuować?'
 
 };

interface/src/i18n/sk/index.ts

@@ -363,7 +363,7 @@ const sk: Translation = {
   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.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujete sa na novú major verziu. Je vhodné najprv vytvoriť systémovú zálohu. Taktiež skontrolujte online nápovľu pre akékoľvek dôležité zmeny.',
   WARNING_SYSTEM_BACKUP: 'Toto vytvorí zálohu všetkých vašich celých systémových konfigurácií a nastavení. Všetky hesla budú čitateľné v zálohovom súbore. Buďte opatrní pri zdieľaní! Chcete pokračovať?'
 
 };

interface/src/i18n/sv/index.ts

@@ -363,7 +363,7 @@ const sv: Translation = {
   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.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Du uppdaterar till en ny major version. Det är rekommenderat att först skapa en systembackup. Kontrollera också onlinehjälpen för eventuella viktiga ändringar.',
   WARNING_SYSTEM_BACKUP: 'Detta kommer att skapa en säkerhetskopia av din fullständiga systemkonfiguration och inställningar. Alla lösenord kommer att vara läsbara i säkerhetskopien. Var försiktig med att dela! Vill du fortsätta?'
 
 };

interface/src/i18n/tr/index.ts

@@ -363,7 +363,7 @@ const tr: Translation = {
   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.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Yeni bir major sürüme güncelleme yapıyorsunuz. Sistem yedeklemesi yapmanız önerilir. Ayrıca online yardımı kontrol ederek önemli değişiklikleri gözden geçirin.',
   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?'
 
 };

lib_standalone/Arduino.cpp

@@ -147,7 +147,5 @@ double ledcSetup(uint8_t chan, double freq, uint8_t bit_num) {
 void ledcAttachPin(uint8_t pin, uint8_t chan) {};
 void ledcAttach(uint8_t pin, uint8_t chan, uint8_t bit_num) {};
 void ledcWrite(uint8_t chan, uint32_t duty) {};
-void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) {};
-void rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) {};
 
 #endif

lib_standalone/Arduino.h

@@ -74,8 +74,6 @@ double ledcSetup(uint8_t chan, double freq, uint8_t bit_num);
 void   ledcAttachPin(uint8_t pin, uint8_t chan);
 void   ledcAttach(uint8_t pin, uint8_t chan, uint8_t bit_num);
 void   ledcWrite(uint8_t chan, uint32_t duty);
-void   neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val);
-void   rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val);
 
 inline int rtc_get_reset_reason(int cpu_no) {
     return 0;

mock-api/package.json

@@ -2,6 +2,7 @@
   "name": "mock-api",
   "version": "3.8.2",
   "description": "mock api for EMS-ESP",
+  "type": "module",
   "author": "proddy, emsesp.org",
   "license": "MIT",
   "scripts": {

mock-api/restServer.ts

@@ -302,10 +302,10 @@ function updateMask(entity: any, de: any, dd: any) {
       const old_custom_name = dd.nodes[dd_objIndex].cn;
       console.log(
         'comparing names, old (' +
-          old_custom_name +
-          ') with new (' +
-          new_custom_name +
-          ')'
+        old_custom_name +
+        ') with new (' +
+        new_custom_name +
+        ')'
       );
       if (old_custom_name !== new_custom_name) {
         changed = true;
@@ -395,23 +395,32 @@ function custom_support() {
 }
 
 // called by Action endpoint upgradeImportantMessages
+// 0 is do nothing
+// 1 is a special upgrade and needs an export->factory reset->import
+// 2 is a major upgrade
 function upgradeImportantMessages(version: string) {
-  // 0 is do nothing
-  // 1 means 3.9 and factory reset required
-  // 2 means a major version upgrade
   let upgradeImportantMessageType_n = 0;
 
-  // see if its a filename with a .bin extension
-  if (version.endsWith('.bin')) {
-    upgradeImportantMessageType_n = 1; // 1 means 3.9 and factory reset required
-  } else if (version.endsWith('.md')) {
-    upgradeImportantMessageType_n = 0;
+  // check file extensions first
+  if (version.endsWith('.md5') || version.endsWith('.json')) {
+    upgradeImportantMessageType_n = 0; // digest / backup restore: no upgrade warning
+  } else if (version.endsWith('.bin')) {
+    // extract the version number from the filename and if its going from 3.8.x to 3.9.x, then set upgradeImportantMessageType_n to 1
+    const versionNumber = version.split('.');
+    if (versionNumber[0] === '3' && versionNumber[1] === '8') {
+      upgradeImportantMessageType_n = 2; // major upgrade
+    }
   } else {
-    // this is a version string like "3.9.0"
-    upgradeImportantMessageType_n = 2;
+    // the parameter is a version string like "3.9.0"
+    upgradeImportantMessageType_n = 2; // major upgrade
   }
 
-  console.log('upgradeImportantMessageType: ' + upgradeImportantMessageType_n);
+  console.log(
+    'upgradeImportantMessageType: version=' +
+    version +
+    ' type=' +
+    upgradeImportantMessageType_n
+  );
   return { upgradeImportantMessageType: upgradeImportantMessageType_n };
 }
 
@@ -424,15 +433,15 @@ function check_upgrade(version: string) {
 
     console.log(
       'Upgrade this version (' +
-        THIS_VERSION +
-        ') to dev (' +
-        dev_version +
-        ') is ' +
-        (DEV_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO') +
-        ' and to stable (' +
-        stable_version +
-        ') is ' +
-        (STABLE_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO')
+      THIS_VERSION +
+      ') to dev (' +
+      dev_version +
+      ') is ' +
+      (DEV_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO') +
+      ' and to stable (' +
+      stable_version +
+      ') is ' +
+      (STABLE_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO')
     );
     data = {
       emsesp_version: THIS_VERSION,

project-words.txt

@@ -776,7 +776,6 @@ negcond
 negheat
 nein
 nennvolumentstrom
-neopixel
 netcmp
 netflowtemp
 netif

src/core/analogsensor.cpp

@@ -299,7 +299,7 @@ void AnalogSensor::reload(bool get_nvs) {
             uint8_t  r = v / 10000;
             uint8_t  g = (v - r * 10000) / 100;
             uint8_t  b = v % 100;
-            EMSESP_RGB_WRITE(sensor.gpio(), 2 * r, 2 * g, 2 * b);
+            rgb_led::write(sensor.gpio(), 2 * r, 2 * g, 2 * b);
             LOG_DEBUG("RGB set to %d, %d, %d", r, g, b);
         } else if (sensor.type() == AnalogType::DIGITAL_OUT) {
             LOG_DEBUG("Digital Write on GPIO %02d", sensor.gpio());
@@ -1001,7 +1001,7 @@ bool AnalogSensor::command_setvalue(const char * value, const int8_t gpio) {
                 uint8_t r = v / 10000;
                 uint8_t g = (v - r * 10000) / 100;
                 uint8_t b = v % 100;
-                EMSESP_RGB_WRITE(sensor.gpio(), 2 * r, 2 * g, 2 * b);
+                rgb_led::write(sensor.gpio(), 2 * r, 2 * g, 2 * b);
                 LOG_DEBUG("RGB set to %d, %d, %d", r, g, b);
             } else if (sensor.type() == AnalogType::PULSE) {
                 uint8_t v = val;

src/core/emsesp.cpp

@@ -1726,6 +1726,15 @@ void EMSESP::start() {
     // start web log service. now we can start capturing logs to the web log
     webLogService.begin();
 
+#ifndef EMSESP_STANDALONE
+    // apply any uploaded settings before any service loads them from the filesystem
+    if (system_.check_restore()) {
+        root             = LittleFS.open(EMSESP_SETTINGS_FILE);
+        factory_settings = !root;
+        root.close();
+    }
+#endif
+
     // loads core system services settings (network, mqtt, ap, ntp etc)
     esp32React.begin();
 
@@ -1773,14 +1782,6 @@ void EMSESP::start() {
     LOG_INFO("Last system reset reason Core0: %s, Core1: %s", system_.reset_reason(0).c_str(), system_.reset_reason(1).c_str());
 #endif
 
-    // see if we're restoring a settings file
-#ifndef EMSESP_STANDALONE
-    if (system_.check_restore()) {
-        LOG_WARNING("EMS-ESP will restart to apply new settings. Please wait.");
-        system_.system_restart();
-    };
-#endif
-
     LOG_DEBUG("eFuse device information: %s", system_.getBBQKeesGatewayDetails().isEmpty() ? "not set" : system_.getBBQKeesGatewayDetails().c_str());
 
     webSettingsService.begin(); // load EMS-ESP Application settings

src/core/rgb_led.cpp

@@ -0,0 +1,166 @@
+/*
+ * EMS-ESP - https://github.com/emsesp/EMS-ESP
+ * Copyright 2020-2025  emsesp.org
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "rgb_led.h"
+
+#ifndef EMSESP_STANDALONE
+#include <esp32-hal-rmt.h>
+#endif
+
+namespace emsesp {
+
+namespace rgb_led {
+
+#ifndef EMSESP_STANDALONE
+
+namespace {
+
+// durations in 100 ns ticks
+constexpr uint16_t T0H = 3; // 300 ns
+constexpr uint16_t T0L = 9; // 900 ns
+constexpr uint16_t T1H = 8; // 800 ns
+constexpr uint16_t T1L = 6; // 600 ns
+
+// rmt_data_t.val layout: duration0:15, level0:1, duration1:15, level1:1 (high then low)
+constexpr uint32_t SYMBOL_0 = T0H | (1UL << 15) | (static_cast<uint32_t>(T0L) << 16);
+constexpr uint32_t SYMBOL_1 = T1H | (1UL << 15) | (static_cast<uint32_t>(T1L) << 16);
+
+constexpr uint32_t RESET_US = 300;
+constexpr uint8_t  NO_PIN   = 0xFF;
+constexpr uint8_t  MAX_PINS = 2; // status LED + an RGB analog sensor; the ESP32-C3 only has 2 RMT TX channels
+
+#if ESP_ARDUINO_VERSION_MAJOR < 3
+constexpr float TICK_NS = 100.0f; // 1 tick = 100 ns
+#else
+constexpr uint32_t RMT_FREQ_HZ = 10000000; // 10 MHz, 1 tick = 100 ns
+#endif
+
+struct Channel {
+    uint8_t  pin        = NO_PIN;
+    uint32_t last_tx_us = 0;
+#if ESP_ARDUINO_VERSION_MAJOR < 3
+    rmt_obj_t * rmt = nullptr; // Core 2 addresses the channel by handle, Core 3 by pin
+#endif
+};
+
+Channel channels[MAX_PINS];
+
+void release(Channel & ch) {
+    if (ch.pin == NO_PIN) {
+        return;
+    }
+#if ESP_ARDUINO_VERSION_MAJOR < 3
+    rmtDeinit(ch.rmt);
+    ch.rmt = nullptr;
+#else
+    rmtDeinit(ch.pin);
+#endif
+    ch.pin = NO_PIN;
+}
+
+Channel * init(uint8_t pin) {
+    Channel * free_slot = nullptr;
+    for (auto & ch : channels) {
+        if (ch.pin == pin) {
+            return &ch;
+        }
+        if (!free_slot && ch.pin == NO_PIN) {
+            free_slot = &ch;
+        }
+    }
+
+    if (!free_slot) {
+        // all slots in use: release the least recently written one
+        const uint32_t now = micros();
+        free_slot          = &channels[0];
+        for (auto & ch : channels) {
+            if (now - ch.last_tx_us > now - free_slot->last_tx_us) {
+                free_slot = &ch;
+            }
+        }
+        release(*free_slot);
+    }
+
+#if ESP_ARDUINO_VERSION_MAJOR < 3
+    rmt_obj_t * rmt = rmtInit(pin, RMT_TX_MODE, RMT_MEM_64);
+    if (!rmt) {
+        return nullptr;
+    }
+    rmtSetTick(rmt, TICK_NS);
+    free_slot->rmt = rmt;
+#else
+    if (!rmtInit(pin, RMT_TX_MODE, RMT_MEM_NUM_BLOCKS_1, RMT_FREQ_HZ)) {
+        return nullptr;
+    }
+#endif
+
+    free_slot->pin        = pin;
+    free_slot->last_tx_us = micros() - RESET_US; // no wait on first write
+    return free_slot;
+}
+
+} // namespace
+
+void write(uint8_t pin, uint8_t red, uint8_t green, uint8_t blue, Order order) {
+    Channel * ch = init(pin);
+    if (!ch) {
+        return;
+    }
+
+    // enforce the latch/reset gap since the previous frame (V6 needs > 280 us)
+    const uint32_t elapsed = micros() - ch->last_tx_us;
+    if (elapsed < RESET_US) {
+        delayMicroseconds(RESET_US - elapsed);
+    }
+
+    const uint8_t bytes[3] = {order == Order::GRB ? green : red, order == Order::GRB ? red : green, blue};
+
+    rmt_data_t frame[24];
+    for (uint8_t i = 0; i < 24; i++) {
+        frame[i].val = (bytes[i >> 3] & (0x80 >> (i & 7))) ? SYMBOL_1 : SYMBOL_0;
+    }
+
+#if ESP_ARDUINO_VERSION_MAJOR < 3
+    rmtWriteBlocking(ch->rmt, frame, 24);
+#else
+    rmtWrite(pin, frame, 24, RMT_WAIT_FOR_EVER);
+#endif
+    ch->last_tx_us = micros();
+}
+
+void end(uint8_t pin) {
+    for (auto & ch : channels) {
+        if (ch.pin == pin) {
+            release(ch);
+        }
+    }
+}
+
+#else
+
+void write(uint8_t, uint8_t, uint8_t, uint8_t, Order) {
+}
+
+void end(uint8_t) {
+}
+
+#endif
+
+} // namespace rgb_led
+
+} // namespace emsesp

src/core/rgb_led.h

@@ -0,0 +1,53 @@
+/*
+ * EMS-ESP - https://github.com/emsesp/EMS-ESP
+ * Copyright 2020-2025  emsesp.org
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef EMSESP_RGB_LED_H_
+#define EMSESP_RGB_LED_H_
+
+#include <Arduino.h>
+
+namespace emsesp {
+
+// WS2812B driver replacing arduino-esp32's rgbLedWrite()/neopixelWrite(), which hard-code
+// T0H = 400 ns, T1L = 400 ns and have no reset gap. The WS2812B-2020-V6 needs T0H 220-380 ns,
+// T1L 580-1000 ns and a reset > 280 us, otherwise it misreads 0-bits as 1-bits (washed-out white).
+// Timings used (10 MHz RMT clock, 1 tick = 100 ns) fit both the original WS2812B and the V6:
+//
+//            sent     old WS2812B    WS2812B-2020-V6
+//   T0H     300 ns    250-550 ns     220-380 ns
+//   T0L     900 ns    700-1000 ns    580-1000 ns
+//   T1H     800 ns    650-950 ns     580-1000 ns
+//   T1L     600 ns    300-600 ns     580-1000 ns
+//   Reset  >300 us    >50 us         >280 us
+//
+// Supports both Arduino Core 2.x (handle based RMT API) and Core 3.x (pin based RMT API).
+// Do not mix with rgbLedWrite()/neopixelWrite() on the same pin, as both claim the pin's RMT channel.
+namespace rgb_led {
+
+enum class Order : uint8_t { GRB, RGB }; // WS2812B is GRB
+
+// Blocks ~30 us for the transmit, plus up to the reset gap if called again right after the previous update.
+// Returns void so it can be used as a drop-in for neopixelWrite()/rgbLedWrite(), e.g. in a ternary with digitalWrite()
+void write(uint8_t pin, uint8_t red, uint8_t green, uint8_t blue, Order order = Order::GRB);
+void end(uint8_t pin); // release the pin's RMT channel, e.g. before reusing the pin for something else
+
+} // namespace rgb_led
+
+} // namespace emsesp
+
+#endif

src/core/system.cpp

@@ -451,7 +451,7 @@ void System::system_restart(const char * partitionname) {
     EMSuart::stop();    // stop UART so there is no interference
 
 #ifndef EMSESP_STANDALONE
-    delay(1000);   // wait 1 second
+    delay(500);    // wait 0.5 second
     ESP.restart(); // ka-boom! - this is the only place where the ESP32 restart is called
 #endif
 }
@@ -664,7 +664,7 @@ void System::led_flash() {
 
         if (led_flash_type_) {
             uint8_t intensity = led_flash_state_ ? RGB_LED_BRIGHTNESS : 0;
-            EMSESP_RGB_WRITE(led_flash_gpio_, intensity, intensity, 0); // RGB LED - Yellow
+            rgb_led::write(led_flash_gpio_, intensity, intensity, 0); // RGB LED - Yellow
         } else {
             digitalWrite(led_flash_gpio_, led_flash_state_ ? LED_ON : !LED_ON); // Standard LED
         }
@@ -673,7 +673,7 @@ void System::led_flash() {
     // after duration, turn off the LED
     if (current_time - led_flash_start_time_ >= led_flash_duration_) {
         if (led_flash_type_) {
-            EMSESP_RGB_WRITE(led_flash_gpio_, 0, 0, 0);
+            rgb_led::write(led_flash_gpio_, 0, 0, 0);
         } else {
             digitalWrite(led_flash_gpio_, !LED_ON);
         }
@@ -732,12 +732,11 @@ void System::button_init() {
 // set the LED to on or off when in normal operating mode
 void System::led_init() {
     // disabled old led port before setting new one
-    led_type_ ? EMSESP_RGB_WRITE(led_gpio_, 0, 0, 0) : digitalWrite(led_gpio_, !LED_ON);
+    led_type_ ? rgb_led::write(led_gpio_, 0, 0, 0) : digitalWrite(led_gpio_, !LED_ON);
 
     if ((led_gpio_)) { // 0 means disabled
         if (led_type_) {
-            // rgb LED WS2812B, use Neopixel
-            EMSESP_RGB_WRITE(led_gpio_, 0, 0, 0);
+            rgb_led::write(led_gpio_, 0, 0, 0); // rgb LED WS2812B
         } else {
             pinMode(led_gpio_, OUTPUT);
             digitalWrite(led_gpio_, !LED_ON); // start with LED off
@@ -954,6 +953,10 @@ void System::network_init() {
 #else
     eth_present_ = ETH.begin(type, phy_addr, mdc, mdio, power, clock_mode);
 #endif
+    // show error if Eth is present but fails to start, so it can be automatically detected by the new installers
+    if (!eth_present_) {
+        LOG_ERROR("Failed to start Ethernet");
+    }
 #endif
 }
 
@@ -1004,13 +1007,13 @@ void System::system_check() {
                 // everything is healthy, show LED permanently on or off depending on setting
                 // Green on RGB LED, on/off on standard LED
                 if (led_gpio_) {
-                    led_type_ ? EMSESP_RGB_WRITE(led_gpio_, 0, hide_led_ ? 0 : RGB_LED_BRIGHTNESS, 0)
+                    led_type_ ? rgb_led::write(led_gpio_, 0, hide_led_ ? 0 : RGB_LED_BRIGHTNESS, 0)
                               : digitalWrite(led_gpio_, hide_led_ ? !LED_ON : LED_ON); // Green
                 }
             } else {
                 // turn off LED so we're ready for the warning flashes
                 if (led_gpio_) {
-                    led_type_ ? EMSESP_RGB_WRITE(led_gpio_, 0, 0, 0) : digitalWrite(led_gpio_, !LED_ON);
+                    led_type_ ? rgb_led::write(led_gpio_, 0, 0, 0) : digitalWrite(led_gpio_, !LED_ON);
                 }
             }
         }
@@ -1046,7 +1049,7 @@ void System::led_monitor() {
     if (button_busy_ != myPButton_.button_busy()) {
         button_busy_ = myPButton_.button_busy();
         if (led_type_) {
-            EMSESP_RGB_WRITE(led_gpio_, button_busy_ ? RGB_LED_BRIGHTNESS : 0, button_busy_ ? RGB_LED_BRIGHTNESS : 0, 0); // Yellow
+            rgb_led::write(led_gpio_, button_busy_ ? RGB_LED_BRIGHTNESS : 0, button_busy_ ? RGB_LED_BRIGHTNESS : 0, 0); // Yellow
         } else {
             digitalWrite(led_gpio_, button_busy_ ? LED_ON : !LED_ON);
         }
@@ -1081,7 +1084,7 @@ void System::led_monitor() {
             // reset the whole sequence
             led_long_timer_ = uuid::get_uptime();
             led_flash_step_ = 0;
-            led_type_ ? EMSESP_RGB_WRITE(led_gpio_, 0, 0, 0) : digitalWrite(led_gpio_, !LED_ON); // LED off
+            led_type_ ? rgb_led::write(led_gpio_, 0, 0, 0) : digitalWrite(led_gpio_, !LED_ON); // LED off
         } else if (led_flash_step_ % 2) {
             // handle the step events (on odd numbers 3,5,7,etc). see if we need to turn on a LED
             //  1 flash (blue) is the EMS bus is not connected
@@ -1093,16 +1096,16 @@ void System::led_monitor() {
             if (led_type_) {
                 if (led_flash_step_ == 3) {
                     if (no_network) {
-                        EMSESP_RGB_WRITE(led_gpio_, RGB_LED_BRIGHTNESS, 0, 0); // red
+                        rgb_led::write(led_gpio_, RGB_LED_BRIGHTNESS, 0, 0); // red
                     } else if (no_bus) {
-                        EMSESP_RGB_WRITE(led_gpio_, 0, 0, RGB_LED_BRIGHTNESS); // blue
+                        rgb_led::write(led_gpio_, 0, 0, RGB_LED_BRIGHTNESS); // blue
                     }
                 }
                 if (led_flash_step_ == 5 && no_network) {
-                    EMSESP_RGB_WRITE(led_gpio_, RGB_LED_BRIGHTNESS, 0, 0); // red
+                    rgb_led::write(led_gpio_, RGB_LED_BRIGHTNESS, 0, 0); // red
                 }
                 if ((led_flash_step_ == 7) && no_network && no_bus) {
-                    EMSESP_RGB_WRITE(led_gpio_, 0, 0, RGB_LED_BRIGHTNESS); // blue
+                    rgb_led::write(led_gpio_, 0, 0, RGB_LED_BRIGHTNESS); // blue
                 }
             } else {
                 if ((led_flash_step_ == 3) && (no_network || no_bus)) {
@@ -1124,7 +1127,7 @@ void System::led_monitor() {
         } else {
             // turn the led off after the flash, on even number count
             if (led_on_) {
-                led_type_ ? EMSESP_RGB_WRITE(led_gpio_, 0, 0, 0) : digitalWrite(led_gpio_, !LED_ON);
+                led_type_ ? rgb_led::write(led_gpio_, 0, 0, 0) : digitalWrite(led_gpio_, !LED_ON);
                 led_on_ = false;
             }
         }
@@ -3024,18 +3027,24 @@ bool System::uploadFirmwareURL(const char * url) {
         return false; // error
     }
 
+    // the Content-Length from the response header, -1 if the server didn't send one.
     int firmware_size = http.getSize();
+    if (firmware_size <= 0) {
+        LOG_ERROR("Firmware upload failed - unknown size");
+        http.end();
+        return false; // error
+    }
 
-    // check we have a valid size
-    if (firmware_size < 2097152) { // 2MB or greater is required
-        LOG_ERROR("Firmware upload failed - invalid size");
+    // catch a wrong URL early, before streaming. Smallest shipped image is ~1.9MB
+    if (firmware_size < 1677721) { // 1.6MB
+        LOG_ERROR("Firmware upload failed - too small (%d KB)", firmware_size / 1024);
         http.end();
         return false; // error
     }
 
     // check we have enough space for the upload in the ota partition
     if (!Update.begin(firmware_size)) {
-        LOG_ERROR("Firmware upload failed - no space");
+        LOG_ERROR("Firmware upload failed - %s", Update.errorString());
         http.end();
         return false; // error
     }
@@ -3052,7 +3061,7 @@ bool System::uploadFirmwareURL(const char * url) {
 
     // get tcp stream and send it to Updater
     WiFiClient * stream = http.getStreamPtr();
-    if (Update.writeStream(*stream) != firmware_size) {
+    if (Update.writeStream(*stream) != (size_t)firmware_size) {
         LOG_ERROR("Firmware upload failed - size differences");
         http.end();
         EMSESP::system_.systemStatus(SYSTEM_STATUS::SYSTEM_STATUS_ERROR_UPLOAD);

src/core/system.h

@@ -37,11 +37,8 @@
 #include <uuid/log.h>
 #include <PButton.h>
 
-#if ESP_ARDUINO_VERSION_MAJOR < 3
-#define EMSESP_RGB_WRITE neopixelWrite
-#else
-#define EMSESP_RGB_WRITE rgbLedWrite
-#endif
+#include "rgb_led.h"
+
 
 #if CONFIG_IDF_TARGET_ESP32
 // there is no official API available on the original ESP32

src/emsesp_version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.8.3-dev.11"
+#define EMSESP_APP_VERSION "3.8.6"